lkml.org 
[lkml]   [2015]   [May]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13.y-ckt 93/95] tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile
    Date
    3.13.11-ckt21 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Thomas D <whissi@whissi.de>

    commit f82263c6989c31ae9b94cecddffb29dcbec38710 upstream.

    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 does not 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>
    Signed-off-by: Len Brown <len.brown@intel.com>
    Signed-off-by: Kamal Mostafa <kamal@canonical.com>
    ---
    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"'
    --
    1.9.1


    \
     
     \ /
      Last update: 2015-05-27 21:41    [W:4.432 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site