target/linux/generic/patches-4.1/010-perf-tools-Create-config.detected-into-OUTPUT-direct.patch

   1 From: Aaro Koskinen <aaro.koskinen@nokia.com>
   2 Date: Wed, 1 Jul 2015 14:54:42 +0300
   3 Subject: [PATCH] perf tools: Create config.detected into OUTPUT directory
   4
   5 Create config.detected into OUTPUT directory instead of source
   6 directory.
   7
   8 This fixes parallel builds that share the same source directory.
   9
  10 Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com>
  11 Acked-by: Jiri Olsa <jolsa@kernel.org>
  12 Cc: Paul Mackerras <paulus@samba.org>
  13 Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
  14 Link: http://lkml.kernel.org/r/1435751683-18500-1-git-send-email-aaro.koskinen@nokia.com
  15 Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  16 ---
  17
  18 --- a/tools/build/Makefile.build
  19 +++ b/tools/build/Makefile.build
  20 @@ -25,7 +25,7 @@ build-dir := $(srctree)/tools/build
  21  include $(build-dir)/Build.include
  22
  23  # do not force detected configuration
  24 --include .config-detected
  25 +-include $(OUTPUT).config-detected
  26
  27  # Init all relevant variables used in build files so
  28  # 1) they have correct type
  29 --- a/tools/perf/Makefile.perf
  30 +++ b/tools/perf/Makefile.perf
  31 @@ -528,7 +528,7 @@ config-clean:
  32  clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean config-clean
  33         $(call QUIET_CLEAN, core-objs)  $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS)
  34         $(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete
  35 -       $(Q)$(RM) .config-detected
  36 +       $(Q)$(RM) $(OUTPUT).config-detected
  37         $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32
  38         $(call QUIET_CLEAN, core-gen)   $(RM)  *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex*
  39         $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
  40 --- a/tools/perf/config/Makefile
  41 +++ b/tools/perf/config/Makefile
  42 @@ -11,9 +11,9 @@ ifneq ($(obj-perf),)
  43  obj-perf := $(abspath $(obj-perf))/
  44  endif
  45
  46 -$(shell echo -n > .config-detected)
  47 -detected     = $(shell echo "$(1)=y"       >> .config-detected)
  48 -detected_var = $(shell echo "$(1)=$($(1))" >> .config-detected)
  49 +$(shell echo -n > $(OUTPUT).config-detected)
  50 +detected     = $(shell echo "$(1)=y"       >> $(OUTPUT).config-detected)
  51 +detected_var = $(shell echo "$(1)=$($(1))" >> $(OUTPUT).config-detected)
  52
  53  CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS)
  54