From 40599b2442ea379905927638c8629e0d8a10a808 Mon Sep 17 00:00:00 2001 From: Konrad Rzeszutek Wilk Date: Tue, 10 Feb 2015 12:38:53 -0500 Subject: [PATCH] Makefile: perf-install does not like to be build in parallel. Disable that (And also don't be so verbose). We also need to fix up the depends. Signed-off-by: Konrad Rzeszutek Wilk --- root_image/Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/root_image/Makefile b/root_image/Makefile index 9b2dacb..385e512 100644 --- a/root_image/Makefile +++ b/root_image/Makefile @@ -838,11 +838,15 @@ perf-depend: $(call RPM_TO_USERSPACE,./usr/bin/expand,$(RPM_DIR)/coreutils) $(call RPM_TO_USERSPACE,./usr/bin/objdump,$(RPM_DIR)/binutils) $(call RPM_TO_USERSPACE,*libunwind*.so*,$(RPM_DIR)/libunwind) +ifeq ($(RPM_ARCH), x86_64) + ln -sf /lib64/libc.so.6 userspace/lib + ln -sf /lib64/ld-linux-x86-64.so.2 userspace/lib/ld-linux.so.2 +endif .PHONY: perf-install perf-install: perf-depend mkdir -p $(LINUX_DST)/tools/perf - NO_LIBNUMA=1 $(MAKE) -j$$(($(NCPUS) * 2)) $(MFLAGS) V=1 NO_GTK2=1 DESTDIR=$(shell pwd)/userspace/ -C $(LINUX_SRC)/tools/perf O=$(LINUX_DST)/tools/perf install + NO_LIBNUMA=1 $(MAKE) $(MFLAGS) NO_GTK2=1 DESTDIR=$(shell pwd)/userspace/ -C $(LINUX_SRC)/tools/perf O=$(LINUX_DST)/tools/perf install $(call RPM_TO_USERSPACE,./usr/bin/objdump,$(RPM_DIR)/binutils) ifeq ($(RPM_ARCH), x86_64) $(call RPM_TO_USERSPACE,./usr/lib64/libopcodes*,$(RPM_DIR)/binutils) -- 2.39.5