mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Paul Mackerras <paulus@samba.org>, Ingo Molnar <mingo@kernel.org>,
	LKML <linux-kernel@vger.kernel.org>, Jiri Olsa <jolsa@redhat.com>,
	David Ahern <dsahern@gmail.com>,
	Namhyung Kim <namhyung.kim@lge.com>
Subject: [PATCH 2/8] tools lib traceevent: Make dependency files regeneratable
Date: Fri, 22 Jun 2012 14:37:36 +0900	[thread overview]
Message-ID: <1340343462-15556-3-git-send-email-namhyung@kernel.org> (raw)
In-Reply-To: <1340343462-15556-1-git-send-email-namhyung@kernel.org>

From: Namhyung Kim <namhyung.kim@lge.com>

Ingo reported that libtraceevent doesn't clean out
dependency (.d) files and it can cause a build error
when the libgcc package upgraded:

 comet:~/tip/tools/perf> make -j
     SUBDIR ../lib/traceevent/
 make[1]: *** No rule to make target `/usr/lib/gcc/x86_64-redhat-linux/4.7.0/include/stddef.h',
  needed by `event-parse.o'.  Stop.
 make: *** [../lib/traceevent//libtraceevent.a] Error 2

So this patch makes the .d files depends on the source
and header files also, so that it can be re-generated
as needed.

NOTE: This code is copied from the GNU make manual page
(4.14 Generating Prerequisites Automatically).

Reported-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
 tools/lib/traceevent/Makefile |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/lib/traceevent/Makefile b/tools/lib/traceevent/Makefile
index 3d69aa9ff51e..68a1d088d77e 100644
--- a/tools/lib/traceevent/Makefile
+++ b/tools/lib/traceevent/Makefile
@@ -250,8 +250,12 @@ endef
 all_objs := $(sort $(ALL_OBJS))
 all_deps := $(all_objs:%.o=.%.d)
 
+# let .d file also depends on the source and header files
 define check_deps
-		$(CC) -M $(CFLAGS) $< > $@;
+		@set -e; $(RM) $@; \
+		$(CC) -M $(CFLAGS) $< > $@.$$$$; \
+		sed 's,\($*\)\.o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
+		$(RM) $@.$$$$
 endef
 
 $(gui_deps): ks_version.h
-- 
1.7.10.2


  parent reply	other threads:[~2012-06-22  5:42 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-22  5:37 [RFC/PATCHSET 0/8] perf tools: Minimal build without libelf dependency (v2) Namhyung Kim
2012-06-22  5:37 ` [PATCH 1/8] perf evsel: Fix a build failure on cross compilation Namhyung Kim
2012-06-22  5:37 ` Namhyung Kim [this message]
2012-06-28 16:15   ` [PATCH 2/8] tools lib traceevent: Make dependency files regeneratable Arnaldo Carvalho de Melo
2012-07-06 10:52   ` [tip:perf/core] " tip-bot for Namhyung Kim
2012-06-22  5:37 ` [PATCH 3/8] tools lib traceevent: Detect build environment changes Namhyung Kim
2012-06-22  5:37 ` [PATCH 4/8] perf symbols: Introduce symbol__elf_init() Namhyung Kim
2012-06-22  5:37 ` [PATCH 5/8] perf symbols: Do not use ELF's symbol binding constants Namhyung Kim
2012-06-22 12:43   ` Arnaldo Carvalho de Melo
2012-06-22 15:19     ` Namhyung Kim
2012-06-22 15:29       ` Arnaldo Carvalho de Melo
2012-06-22  5:37 ` [PATCH 6/8] perf tools: Split out util/symbol-elf.c Namhyung Kim
2012-06-22  5:37 ` [PATCH 7/8] perf tools: Support minimal build without libelf Namhyung Kim
2012-06-22  5:37 ` [PATCH 8/8] perf symbols: Implement poor man's ELF parser Namhyung Kim
2012-06-22  9:47 ` [RFC/PATCHSET 0/8] perf tools: Minimal build without libelf dependency (v2) Peter Zijlstra
2012-06-22 15:05   ` Namhyung Kim
2012-06-22 15:18     ` David Ahern
2012-06-22 15:30       ` Namhyung Kim
2012-06-22 15:35         ` David Ahern
2012-06-22 16:14           ` Arnaldo Carvalho de Melo
2012-06-22 16:24             ` David Ahern
2012-06-25  0:51               ` Namhyung Kim
2012-06-22 15:32       ` Arnaldo Carvalho de Melo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1340343462-15556-3-git-send-email-namhyung@kernel.org \
    --to=namhyung@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@ghostprotocols.net \
    --cc=dsahern@gmail.com \
    --cc=jolsa@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung.kim@lge.com \
    --cc=paulus@samba.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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®