Skip to contentSkip to conversation

perf/urgent fix

GIT PULL New Arnaldo Carvalho de Melo 2 participants 3 messages Jun 19, 2015

lore
Share & tools
lore
#0 lore raw

Hi Ingo,

Please consider pulling,

- Arnaldo

The following changes since commit 15c1247953e8a45232ed5a5540f291d2d0a77665:

Revert "perf/x86/intel/uncore: Move uncore_box_init() out of driver initialization" (2015-06-09 11:44:37 +0200)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-urgent-for-mingo

for you to fetch changes up to 75e84ab906ef8935cff3df3d8929f1bafea81599:

perf tools: Fix build breakage if prefix= is specified (2015-06-19 16:39:42 -0300)

----------------------------------------------------------------
perf/urgent fix:

User visible:

- Fix build breakage if prefix= is specified, this introduced a regression for a build idiom used by the Debian "linux-tools" package, that does:

     MAKE_PERF := $(MAKE) prefix=/usr V=1 ARCH=$(KERNEL_ARCH_PERF) ...

Fix it. (Lukas Wunner)

----------------------------------------------------------------
Lukas Wunner (1):
perf tools: Fix build breakage if prefix= is specified

 tools/build/Makefile.build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/

#1 lore raw

PATCH 1/1 perf tools: Fix build breakage if prefix= is specified

From: Lukas Wunner <[email protected]>

Invoking Makefile.perf with prefix= breaks the build since Makefile.perf hands that variable down to Makefile.build where it overrides

    prefix       := $(subst ./,,$(OUTPUT)$(dir)/)

leading to errors like this:

No rule to make target '/usrabspath.o', needed by '/usrlibperf-in.o'

---
 tools/build/Makefile.build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
tools/build/Makefile.build +4 -4
index 10df57237a66..98cfc388ea33 100644
@@ -94,12 +94,12 @@ obj-y        := $(patsubst %/, %/$(obj)-in.o, $(obj-y))
 subdir-obj-y := $(filter %/$(obj)-in.o, $(obj-y))
 
 # '$(OUTPUT)/dir' prefix to all objects
-prefix       := $(subst ./,,$(OUTPUT)$(dir)/)
-obj-y        := $(addprefix $(prefix),$(obj-y))
-subdir-obj-y := $(addprefix $(prefix),$(subdir-obj-y))
+objprefix    := $(subst ./,,$(OUTPUT)$(dir)/)
+obj-y        := $(addprefix $(objprefix),$(obj-y))
+subdir-obj-y := $(addprefix $(objprefix),$(subdir-obj-y))
 
 # Final '$(obj)-in.o' object
-in-target := $(prefix)$(obj)-in.o
+in-target := $(objprefix)$(obj)-in.o
 
 PHONY += $(subdir-y)
 
Signature · 5 lines
2.1.0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
Please read the FAQ at  http://www.tux.org/lkml/
#2 lore raw
In reply to Arnaldo Carvalho de Melo
Quoted 31 lines · Arnaldo Carvalho de Melo

Hi Ingo,

Please consider pulling,

- Arnaldo

The following changes since commit 15c1247953e8a45232ed5a5540f291d2d0a77665:

Revert "perf/x86/intel/uncore: Move uncore_box_init() out of driver initialization" (2015-06-09 11:44:37 +0200)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-urgent-for-mingo

for you to fetch changes up to 75e84ab906ef8935cff3df3d8929f1bafea81599:

perf tools: Fix build breakage if prefix= is specified (2015-06-19 16:39:42 -0300)

----------------------------------------------------------------
perf/urgent fix:

User visible:

- Fix build breakage if prefix= is specified, this introduced a regression for a build idiom used by the Debian "linux-tools" package, that does:

     MAKE_PERF := $(MAKE) prefix=/usr V=1 ARCH=$(KERNEL_ARCH_PERF) ...

Fix it. (Lukas Wunner)

Quoted 8 lines

----------------------------------------------------------------
Lukas Wunner (1):
perf tools: Fix build breakage if prefix= is specified

 tools/build/Makefile.build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Pulled, thanks Arnaldo!

Ingo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/