* [PATCH] tools/power: turbostat: Use $(CURDIR) instead of $(PWD) in Makefile
@ 2015-01-04 17:52 Thomas D
2015-01-05 19:11 ` Mark Asselstine
0 siblings, 1 reply; 4+ messages in thread
From: Thomas D @ 2015-01-04 17:52 UTC (permalink / raw)
To: linux-kernel; +Cc: Thomas D, Mark Asselstine, Len Brown
Since commit ee0778a30153 ("tools/power: turbostat: make Makefile a bit
more capable") turbostat’s Makefile is using
[...]
BUILD_OUTPUT := $(PWD)
[...]
which obviously causes trouble when building "turbostat" with
make -C /usr/src/linux/tools/power/x86/turbostat ARCH=x86 turbostat
because GNU make doesn’t update nor guarantee that $PWD is set.
This patch changes the Makefile to use $CURDIR instead, which GNU make
guarantees to set and update (i.e. when using "make –C ...").
Link: https://bugs.gentoo.org/show_bug.cgi?id=533918
Fixes: ee0778a30153 ("tools/power: turbostat: make Makefile a bit more capable")
Signed-off-by: Thomas D. <whissi@whissi.de>
Cc: Mark Asselstine <mark.asselstine@windriver.com>
Cc: Len Brown <len.brown@intel.com>
---
tools/power/x86/turbostat/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/power/x86/turbostat/Makefile b/tools/power/x86/turbostat/Makefile
index d1b3a36..6dd4cad 100644
--- a/tools/power/x86/turbostat/Makefile
+++ b/tools/power/x86/turbostat/Makefile
@@ -1,5 +1,5 @@
CC = $(CROSS_COMPILE)gcc
-BUILD_OUTPUT := $(PWD)
+BUILD_OUTPUT := $(CURDIR)
PREFIX := /usr
DESTDIR :=
--
2.2.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] tools/power: turbostat: Use $(CURDIR) instead of $(PWD) in Makefile
2015-01-04 17:52 [PATCH] tools/power: turbostat: Use $(CURDIR) instead of $(PWD) in Makefile Thomas D
@ 2015-01-05 19:11 ` Mark Asselstine
2015-01-05 20:37 ` Thomas D
0 siblings, 1 reply; 4+ messages in thread
From: Mark Asselstine @ 2015-01-05 19:11 UTC (permalink / raw)
To: Thomas D; +Cc: linux-kernel, Len Brown
On January 4, 2015 18:52:43 Thomas D wrote:
> Since commit ee0778a30153 ("tools/power: turbostat: make Makefile a bit
> more capable") turbostat’s Makefile is using
>
> [...]
> BUILD_OUTPUT := $(PWD)
> [...]
>
> which obviously causes trouble when building "turbostat" with
>
> make -C /usr/src/linux/tools/power/x86/turbostat ARCH=x86 turbostat
>
> because GNU make doesn’t update nor guarantee that $PWD is set.
>
> This patch changes the Makefile to use $CURDIR instead, which GNU make
> guarantees to set and update (i.e. when using "make –C ...").
>
> Link: https://bugs.gentoo.org/show_bug.cgi?id=533918
> Fixes: ee0778a30153 ("tools/power: turbostat: make Makefile a bit more
> capable") Signed-off-by: Thomas D. <whissi@whissi.de>
> Cc: Mark Asselstine <mark.asselstine@windriver.com>
Looks fine. I am wondering if we should take this opportunity to respect "O="
as the kernel does. ie. default to CURDIR but using whatever is passed in via
O= on the cmdline.
Mark
> Cc: Len Brown <len.brown@intel.com>
> ---
> tools/power/x86/turbostat/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/power/x86/turbostat/Makefile
> b/tools/power/x86/turbostat/Makefile index d1b3a36..6dd4cad 100644
> --- a/tools/power/x86/turbostat/Makefile
> +++ b/tools/power/x86/turbostat/Makefile
> @@ -1,5 +1,5 @@
> CC = $(CROSS_COMPILE)gcc
> -BUILD_OUTPUT := $(PWD)
> +BUILD_OUTPUT := $(CURDIR)
> PREFIX := /usr
> DESTDIR :=
>
> --
> 2.2.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] tools/power: turbostat: Use $(CURDIR) instead of $(PWD) in Makefile
2015-01-05 19:11 ` Mark Asselstine
@ 2015-01-05 20:37 ` Thomas D
2015-01-05 20:54 ` Mark Asselstine
0 siblings, 1 reply; 4+ messages in thread
From: Thomas D @ 2015-01-05 20:37 UTC (permalink / raw)
To: linux-kernel; +Cc: Thomas D, Mark Asselstine, Len Brown
[PATCH] tools/power: turbostat: Use $(CURDIR) instead of $(PWD) and
add support for O= option in Makefil
Since commit ee0778a30153 ("tools/power: turbostat: make Makefile a bit
more capable") turbostat’s Makefile is using
[...]
BUILD_OUTPUT := $(PWD)
[...]
which obviously causes trouble when building "turbostat" with
make -C /usr/src/linux/tools/power/x86/turbostat ARCH=x86 turbostat
because GNU make doesn’t update nor guarantee that $PWD is set.
This patch changes the Makefile to use $CURDIR instead, which GNU make
guarantees to set and update (i.e. when using "make –C ...") and also
adds support for the O= option (see "make help" in your root of your
kernel source tree for more details).
Link: https://bugs.gentoo.org/show_bug.cgi?id=533918
Fixes: ee0778a30153 ("tools/power: turbostat: make Makefile a bit more capable")
Signed-off-by: Thomas D. <whissi@whissi.de>
Cc: Mark Asselstine <mark.asselstine@windriver.com>
Cc: Len Brown <len.brown@intel.com>
---
I followed Mark's suggestion and also added support for the O= option.
I took the logic from tools/power/cpupower/Makefile.
...i also hope this reply will work and doesn't break the tread ;)
tools/power/x86/turbostat/Makefile | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/power/x86/turbostat/Makefile b/tools/power/x86/turbostat/Makefile
index d1b3a36..4039854 100644
--- a/tools/power/x86/turbostat/Makefile
+++ b/tools/power/x86/turbostat/Makefile
@@ -1,8 +1,12 @@
CC = $(CROSS_COMPILE)gcc
-BUILD_OUTPUT := $(PWD)
+BUILD_OUTPUT := $(CURDIR)
PREFIX := /usr
DESTDIR :=
+ifeq ("$(origin O)", "command line")
+ BUILD_OUTPUT := $(O)
+endif
+
turbostat : turbostat.c
CFLAGS += -Wall
CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/uapi/asm/msr-index.h"'
--
2.2.1
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] tools/power: turbostat: Use $(CURDIR) instead of $(PWD) in Makefile
2015-01-05 20:37 ` Thomas D
@ 2015-01-05 20:54 ` Mark Asselstine
0 siblings, 0 replies; 4+ messages in thread
From: Mark Asselstine @ 2015-01-05 20:54 UTC (permalink / raw)
To: Thomas D; +Cc: linux-kernel, Len Brown
On January 5, 2015 21:37:23 Thomas D wrote:
> [PATCH] tools/power: turbostat: Use $(CURDIR) instead of $(PWD) and
> add support for O= option in Makefil
>
> Since commit ee0778a30153 ("tools/power: turbostat: make Makefile a bit
> more capable") turbostat’s Makefile is using
>
> [...]
> BUILD_OUTPUT := $(PWD)
> [...]
>
> which obviously causes trouble when building "turbostat" with
>
> make -C /usr/src/linux/tools/power/x86/turbostat ARCH=x86 turbostat
>
> because GNU make doesn’t update nor guarantee that $PWD is set.
>
> This patch changes the Makefile to use $CURDIR instead, which GNU make
> guarantees to set and update (i.e. when using "make –C ...") and also
> adds support for the O= option (see "make help" in your root of your
> kernel source tree for more details).
>
> Link: https://bugs.gentoo.org/show_bug.cgi?id=533918
> Fixes: ee0778a30153 ("tools/power: turbostat: make Makefile a bit more
> capable") Signed-off-by: Thomas D. <whissi@whissi.de>
> Cc: Mark Asselstine <mark.asselstine@windriver.com>
> Cc: Len Brown <len.brown@intel.com>
> ---
> I followed Mark's suggestion and also added support for the O= option.
> I took the logic from tools/power/cpupower/Makefile.
>
> ...i also hope this reply will work and doesn't break the tread ;)
Looks OK to me. You could have always started a new 'v2' thread with '[PATCH
v2]' so no worries.
Mark
>
> tools/power/x86/turbostat/Makefile | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/tools/power/x86/turbostat/Makefile
> b/tools/power/x86/turbostat/Makefile index d1b3a36..4039854 100644
> --- a/tools/power/x86/turbostat/Makefile
> +++ b/tools/power/x86/turbostat/Makefile
> @@ -1,8 +1,12 @@
> CC = $(CROSS_COMPILE)gcc
> -BUILD_OUTPUT := $(PWD)
> +BUILD_OUTPUT := $(CURDIR)
> PREFIX := /usr
> DESTDIR :=
>
> +ifeq ("$(origin O)", "command line")
> + BUILD_OUTPUT := $(O)
> +endif
> +
> turbostat : turbostat.c
> CFLAGS += -Wall
> CFLAGS += -DMSRHEADER='"../../../../arch/x86/include/uapi/asm/msr-
index.h"'
> --
> 2.2.1
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-01-05 20:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-04 17:52 [PATCH] tools/power: turbostat: Use $(CURDIR) instead of $(PWD) in Makefile Thomas D
2015-01-05 19:11 ` Mark Asselstine
2015-01-05 20:37 ` Thomas D
2015-01-05 20:54 ` Mark Asselstine
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®