[gentoo-commits] gentoo-x86 commit in sys-apps/x86info/files: x86info-1.25-parallel-make-cleanup.patch

[gentoo-commits] gentoo-x86 commit in sys-apps/x86info/files: x86info-1.25-parallel-make-cleanup.patch

[Robin H. Johnson (robbat2)]

robbat2     09/11/04 05:21:19

  Added:                x86info-1.25-parallel-make-cleanup.patch
  Log:
  Version bump per bug #291446, also more parallel make fixes.
  (Portage version: 2.2_rc48/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-apps/x86info/files/x86info-1.25-parallel-make-cleanup.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/x86info/files/x86info-1.25-parallel-make-cleanup.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/x86info/files/x86info-1.25-parallel-make-cleanup.patch?rev=1.1&content-type=text/plain

Index: x86info-1.25-parallel-make-cleanup.patch
===================================================================
diff -Nuar --exclude '*.rej' --exclude '*.orig' x86info-1.25.orig/Makefile x86info-1.25/Makefile
--- x86info-1.25.orig/Makefile	2009-10-30 15:59:46.000000000 +0000
+++ x86info-1.25/Makefile	2009-11-04 05:16:10.983250367 +0000
@@ -2,15 +2,25 @@
 # -Wstrict-overflow=5
 CC = gcc
 
+.PRECIOUS: %.d
+
 SHELL = /bin/sh
 
 
-.c.o:
-	$(CC) $(CFLAGS) -MMD -o $@ -c $<
-	@cp $*.d $*.P; \
+%.d: %.c
+	$(CC) $(CFLAGS) -E -MMD -MF $@ $< >/dev/null
+
+%.d: %.h
+	$(CC) $(CFLAGS) -E -MMD -MF $@ $< >/dev/null
+
+%.P: %.d
+	cat $< >$@.tmp ; \
 	 sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-	     -e '/^$$/ d' -e 's/$$/ :/' < $*.d >> $*.P; \
-	rm -f $*.d
+		-e '/^$$/ d' -e 's/$$/ :/' < $@.tmp >> $@.tmp ; \
+	mv $@.tmp $@
+
+.c.o:
+	$(CC) $(CFLAGS) -o $@ -c $<
 
 .S.o:
 	$(CC) $(CFLAGS) -o $@ -c $<
@@ -22,7 +32,8 @@
 LSMSR_TMP_HEADERS=AMD/k8.h AMD/fam10h.h AMD/fam11h.h generic_msr.h
 
 %.h: %.regs scripts/createheader.py
-	python scripts/createheader.py $< `basename $< .regs` >$@
+	python scripts/createheader.py $< `basename $< .regs` >$@.tmp ; \
+	mv $@.tmp $@
 
 LSMSR_SRC =\
 	lsmsr.c\
@@ -30,11 +41,12 @@
 	havecpuid.c
 
 LSMSR_OBJS = $(LSMSR_SRC:%.c=%.o)
+LSMSR_DEPS = $(patsubst %.h,%.P,$(patsubst %.c,%.P,$(LSMSR_SRC))) $(patsubst %.h,%.P,$(LSMSR_TMP_HEADERS))
 
-lsmsr: $(LSMSR_TMP_HEADERS) $(LSMSR_OBJS)
-	$(CC) $(CFLAGS) -o lsmsr $(LSMSR_OBJS)
+lsmsr: $(LSMSR_TMP_HEADERS) $(LSMSR_OBJS) $(LSMSR_DEPS)
+	$(CC) $(LDFLAGS) $(CFLAGS) -o lsmsr $(LSMSR_OBJS)
 
--include $(LSMSR_SRC:%.c=%.P)
+-include $(LSMSR_DEPS)
 
 X86INFO_SRC =\
 	AMD/identify.c\
@@ -89,12 +101,12 @@
 	bench/MHz.c
 
 X86INFO_OBJS = $(X86INFO_SRC:%.c=%.o)
+X86INFO_DEPS = $(patsubst %.h,%.P,$(patsubst %.c,%.P,$(X86INFO_SRC))) $(patsubst %.h,%.P,$(LSMSR_TMP_HEADERS))
 
-x86info: $(X86INFO_OBJS)
-	$(CC) $(CFLAGS) -o x86info $(X86INFO_OBJS)
-
--include $(X86INFO_SRC:%.c=%.P)
+x86info: $(X86INFO_OBJS) $(X86INFO_DEPS)
+	$(CC) $(LDFLAGS) $(CFLAGS) -o x86info $(X86INFO_OBJS)
 
+-include $(X86INFO_DEPS)
 
 nodes:
 	scripts/makenodes
@@ -113,6 +125,7 @@
 	@find . -name "*.o" -exec rm {} \;
 	@find . -name "*~" -exec rm {} \;
 	@find . -name "*.P" -exec rm {} \;
+	@find . -name "*.d" -exec rm {} \;
 	@rm -f x86info x86info.exe
 	@rm -f lsmsr $(LSMSR_TMP_HEADERS)
 
@@ -121,3 +134,6 @@
 
 sparse:
 	sparse $(X86INFO_SRC)
+
+deps-headers: $(LSMSR_TMP_HEADERS)
+deps: deps-headers $(LSMSR_DEPS) $(X86INFO_DEPS)

[gentoo-commits] gentoo-x86 commit in sys-apps/x86info/files: x86info-1.25-parallel-make-cleanup.patch

[Samuli Suominen (ssuominen)]

ssuominen    12/03/30 13:20:40

  Removed:              x86info-1.25-parallel-make-cleanup.patch
  Log:
  punt the non-building copies
  
  (Portage version: 2.2.0_alpha96/cvs/Linux x86_64)