| 1 |
robbat2 11/02/03 03:07:06 |
| 2 |
|
| 3 |
Added: btrace-1.0.1-ldflags-parallel-make.patch |
| 4 |
Log: |
| 5 |
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. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 sys-block/btrace/files/btrace-1.0.1-ldflags-parallel-make.patch |
| 11 |
|
| 12 |
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 |
| 13 |
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 |
| 14 |
|
| 15 |
Index: btrace-1.0.1-ldflags-parallel-make.patch |
| 16 |
=================================================================== |
| 17 |
diff -Nuar blktrace-1.0.1.orig/btreplay/Makefile blktrace-1.0.1/btreplay/Makefile |
| 18 |
--- blktrace-1.0.1.orig/btreplay/Makefile 2009-05-11 12:00:10.000000000 +0000 |
| 19 |
+++ blktrace-1.0.1/btreplay/Makefile 2011-02-03 03:01:41.161365886 +0000 |
| 20 |
@@ -32,10 +32,10 @@ |
| 21 |
$(CC) $(CFLAGS) -c -o $*.o $< |
| 22 |
|
| 23 |
btrecord: btrecord.o |
| 24 |
- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) |
| 25 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) |
| 26 |
|
| 27 |
btreplay: btreplay.o |
| 28 |
- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) |
| 29 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) |
| 30 |
|
| 31 |
depend: |
| 32 |
@$(CC) -MM $(CFLAGS) *.c 1> .depend |
| 33 |
diff -Nuar blktrace-1.0.1.orig/btt/Makefile blktrace-1.0.1/btt/Makefile |
| 34 |
--- blktrace-1.0.1.orig/btt/Makefile 2009-05-11 12:00:10.000000000 +0000 |
| 35 |
+++ blktrace-1.0.1/btt/Makefile 2011-02-03 03:01:41.161365886 +0000 |
| 36 |
@@ -38,7 +38,7 @@ |
| 37 |
$(CC) $(CFLAGS) -c -o $*.o $< |
| 38 |
|
| 39 |
btt: $(OBJS) |
| 40 |
- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) |
| 41 |
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) |
| 42 |
|
| 43 |
ifneq ($(wildcard .depend),) |
| 44 |
include .depend |
| 45 |
diff -Nuar blktrace-1.0.1.orig/Makefile blktrace-1.0.1/Makefile |
| 46 |
--- blktrace-1.0.1.orig/Makefile 2009-05-11 12:00:10.000000000 +0000 |
| 47 |
+++ blktrace-1.0.1/Makefile 2011-02-03 03:03:32.713725832 +0000 |
| 48 |
@@ -4,38 +4,35 @@ |
| 49 |
PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon |
| 50 |
LIBS = -lpthread |
| 51 |
SCRIPTS = btrace |
| 52 |
+SUBDIRS = btreplay btt |
| 53 |
|
| 54 |
-ALL = $(PROGS) $(SCRIPTS) btt/btt btreplay/btrecord btreplay/btreplay \ |
| 55 |
+ALL = $(PROGS) $(SCRIPTS) |
| 56 |
+INSTALL_ALL = $(ALL) btt/btt btreplay/btrecord btreplay/btreplay \ |
| 57 |
btt/bno_plot.py |
| 58 |
|
| 59 |
-all: $(ALL) |
| 60 |
+all: $(ALL) $(SUBDIRS) |
| 61 |
+.PHONY: $(SUBDIRS) |
| 62 |
|
| 63 |
-btt/btt: |
| 64 |
- $(MAKE) -C btt |
| 65 |
- |
| 66 |
-btreplay/btrecord: |
| 67 |
- $(MAKE) -C btreplay |
| 68 |
- |
| 69 |
-btreplay/btreplay: |
| 70 |
- $(MAKE) -C btreplay |
| 71 |
+$(SUBDIRS): $(PROGS) |
| 72 |
+ $(MAKE) -C $@ |
| 73 |
|
| 74 |
%.o: %.c |
| 75 |
$(CC) -o $*.o -c $(ALL_CFLAGS) $< |
| 76 |
|
| 77 |
blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o |
| 78 |
- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) |
| 79 |
+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) |
| 80 |
|
| 81 |
blktrace: blktrace.o act_mask.o |
| 82 |
- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) |
| 83 |
+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) |
| 84 |
|
| 85 |
verify_blkparse: verify_blkparse.o |
| 86 |
- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) |
| 87 |
+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) |
| 88 |
|
| 89 |
blkrawverify: blkrawverify.o |
| 90 |
- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) |
| 91 |
+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) |
| 92 |
|
| 93 |
blkiomon: blkiomon.o rbtree.o |
| 94 |
- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt |
| 95 |
+ $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt |
| 96 |
|
| 97 |
$(PROGS): | depend |
| 98 |
|
| 99 |
@@ -81,7 +78,7 @@ |
| 100 |
$(INSTALL) -m 755 -d $(DESTDIR)$(bindir) |
| 101 |
$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1 |
| 102 |
$(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man8 |
| 103 |
- $(INSTALL) -m 755 $(ALL) $(DESTDIR)$(bindir) |
| 104 |
+ $(INSTALL) -m 755 $(INSTALL_ALL) $(DESTDIR)$(bindir) |
| 105 |
$(INSTALL) -m 644 doc/*.1 $(DESTDIR)$(mandir)/man1 |
| 106 |
$(INSTALL) -m 644 doc/*.8 $(DESTDIR)$(mandir)/man8 |
Archives