[gentoo-commits] gentoo-x86 commit in sys-block/btrace/files: btrace-1.0.1-ldflags-parallel-make.patch

[gentoo-commits] gentoo-x86 commit in sys-block/btrace/files: btrace-1.0.1-ldflags-parallel-make.patch

[Robin H. Johnson (robbat2)]

robbat2     11/02/03 03:07:06

  Added:                btrace-1.0.1-ldflags-parallel-make.patch
  Log:
  Revamp the parallel build improvements. Bug #335741: respect LDFLAGS. Bug #348281: Fix USE=doc building missing DEPEND. Bug #269121: Remove old versions where SRC_URI is no longer valid.
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  sys-block/btrace/files/btrace-1.0.1-ldflags-parallel-make.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/btrace/files/btrace-1.0.1-ldflags-parallel-make.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-block/btrace/files/btrace-1.0.1-ldflags-parallel-make.patch?rev=1.1&content-type=text/plain

Index: btrace-1.0.1-ldflags-parallel-make.patch
===================================================================
diff -Nuar blktrace-1.0.1.orig/btreplay/Makefile blktrace-1.0.1/btreplay/Makefile
--- blktrace-1.0.1.orig/btreplay/Makefile	2009-05-11 12:00:10.000000000 +0000
+++ blktrace-1.0.1/btreplay/Makefile	2011-02-03 03:01:41.161365886 +0000
@@ -32,10 +32,10 @@
 	$(CC) $(CFLAGS) -c -o $*.o $<
 
 btrecord: btrecord.o
-	$(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
 
 btreplay: btreplay.o
-	$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
 
 depend:
 	@$(CC) -MM $(CFLAGS) *.c 1> .depend
diff -Nuar blktrace-1.0.1.orig/btt/Makefile blktrace-1.0.1/btt/Makefile
--- blktrace-1.0.1.orig/btt/Makefile	2009-05-11 12:00:10.000000000 +0000
+++ blktrace-1.0.1/btt/Makefile	2011-02-03 03:01:41.161365886 +0000
@@ -38,7 +38,7 @@
 	$(CC) $(CFLAGS) -c -o $*.o $<
 
 btt: $(OBJS)
-	$(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
 
 ifneq ($(wildcard .depend),)
 include .depend
diff -Nuar blktrace-1.0.1.orig/Makefile blktrace-1.0.1/Makefile
--- blktrace-1.0.1.orig/Makefile	2009-05-11 12:00:10.000000000 +0000
+++ blktrace-1.0.1/Makefile	2011-02-03 03:03:32.713725832 +0000
@@ -4,38 +4,35 @@
 PROGS	= blkparse blktrace verify_blkparse blkrawverify blkiomon
 LIBS	= -lpthread
 SCRIPTS	= btrace
+SUBDIRS = btreplay btt
 
-ALL = $(PROGS) $(SCRIPTS) btt/btt btreplay/btrecord btreplay/btreplay \
+ALL = $(PROGS) $(SCRIPTS)
+INSTALL_ALL = $(ALL) btt/btt btreplay/btrecord btreplay/btreplay \
       btt/bno_plot.py
 
-all: $(ALL)
+all: $(ALL) $(SUBDIRS)
+.PHONY: $(SUBDIRS)
 
-btt/btt:
-	$(MAKE) -C btt
-
-btreplay/btrecord:
-	$(MAKE) -C btreplay
-
-btreplay/btreplay:
-	$(MAKE) -C btreplay
+$(SUBDIRS): $(PROGS)
+	$(MAKE) -C $@
 
 %.o: %.c
 	$(CC) -o $*.o -c $(ALL_CFLAGS) $<
 
 blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o
-	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
+	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
 
 blktrace: blktrace.o act_mask.o
-	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
+	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS)
 
 verify_blkparse: verify_blkparse.o
-	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
+	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
 
 blkrawverify: blkrawverify.o
-	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^)
+	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^)
 
 blkiomon: blkiomon.o rbtree.o
-	$(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt
+	$(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt
 
 $(PROGS): | depend
 
@@ -81,7 +78,7 @@
 	$(INSTALL) -m 755 -d $(DESTDIR)$(bindir)
 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
 	$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man8
-	$(INSTALL) -m 755 $(ALL) $(DESTDIR)$(bindir)
+	$(INSTALL) -m 755 $(INSTALL_ALL) $(DESTDIR)$(bindir)
 	$(INSTALL) -m 644 doc/*.1 $(DESTDIR)$(mandir)/man1
 	$(INSTALL) -m 644 doc/*.8 $(DESTDIR)$(mandir)/man8