| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | blktrace: obey LDFLAGS |
| 2 | |
| 3 | Upstream-Status: Pending |
| 4 | |
| 5 | Signed-off-by: Christopher Larson <chris_larson@mentor.com> |
| 6 | |
| 7 | the patch was imported from meta-mentor layer on yoctoproject git server |
| 8 | http://git.yoctoproject.org/cgit/cgit.cgi/meta-mentor as of commit id |
| 9 | aed463414e2e2bf8ca44ba54ee5973e7ed599e57 |
| 10 | |
| 11 | Signed-off-by: Fahad Usman <fahad_usman@mentor.com> |
| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 12 | |
| 13 | --- git.orig/Makefile |
| 14 | +++ git/Makefile |
| 15 | @@ -1,5 +1,6 @@ |
| 16 | CC = gcc |
| 17 | CFLAGS = -Wall -O2 -g -W |
| 18 | +LDFLAGS = |
| 19 | ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 |
| 20 | PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon |
| 21 | LIBS = -lpthread |
| 22 | @@ -23,19 +24,19 @@ btreplay/btreplay: |
| 23 | $(CC) -o $*.o -c $(ALL_CFLAGS) $< |
| 24 | |
| 25 | blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o |
| 26 | - $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) |
| 27 | + $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS) |
| 28 | |
| 29 | blktrace: blktrace.o act_mask.o |
| 30 | - $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) |
| 31 | + $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS) |
| 32 | |
| 33 | verify_blkparse: verify_blkparse.o |
| 34 | - $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) |
| 35 | + $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS) |
| 36 | |
| 37 | blkrawverify: blkrawverify.o |
| 38 | - $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) |
| 39 | + $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS) |
| 40 | |
| 41 | blkiomon: blkiomon.o rbtree.o |
| 42 | - $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt |
| 43 | + $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt $(LDFLAGS) |
| 44 | |
| 45 | $(PROGS): | depend |
| 46 | |
| 47 | --- git.orig/btreplay/Makefile |
| 48 | +++ git/btreplay/Makefile |
| 49 | @@ -7,6 +7,7 @@ |
| 50 | |
| 51 | CC = gcc |
| 52 | CFLAGS = -Wall -W -O2 -g |
| 53 | +LDFLAGS = |
| 54 | INCS = -I. -I.. -I../btt |
| 55 | OCFLAGS = -UCOUNT_IOS -UDEBUG -DNDEBUG |
| 56 | XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 |
| 57 | @@ -32,10 +33,10 @@ clean: docsclean |
| 58 | $(CC) $(CFLAGS) -c -o $*.o $< |
| 59 | |
| 60 | btrecord: btrecord.o |
| 61 | - $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) |
| 62 | + $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS) |
| 63 | |
| 64 | btreplay: btreplay.o |
| 65 | - $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) |
| 66 | + $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS) |
| 67 | |
| 68 | depend: |
| 69 | @$(CC) -MM $(CFLAGS) *.c 1> .depend |
| 70 | --- git.orig/btt/Makefile |
| 71 | +++ git/btt/Makefile |
| 72 | @@ -7,6 +7,7 @@ |
| 73 | |
| 74 | CC = gcc |
| 75 | CFLAGS = -Wall -W -O2 -g |
| 76 | +LDFLAGS = |
| 77 | INCS = -I. -I.. |
| 78 | XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 |
| 79 | override CFLAGS += $(INCS) $(XCFLAGS) |
| 80 | @@ -38,7 +39,7 @@ clean: docsclean |
| 81 | $(CC) $(CFLAGS) -c -o $*.o $< |
| 82 | |
| 83 | btt: $(OBJS) |
| 84 | - $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) |
| 85 | + $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS) |
| 86 | |
| 87 | ifneq ($(wildcard .depend),) |
| 88 | include .depend |
| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 89 | --- git.orig/iowatcher/Makefile |
| 90 | +++ git/iowatcher/Makefile |
| 91 | @@ -1,5 +1,6 @@ |
| 92 | C = gcc |
| 93 | CFLAGS = -Wall -O0 -g -W |
| 94 | +LDFLAGS = |
| 95 | ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 |
| 96 | |
| 97 | PROGS = iowatcher |
| 98 | @@ -19,7 +20,7 @@ all: $(ALL) |
| 99 | $(CC) -o $*.o -c $(ALL_CFLAGS) $< |
| 100 | |
| 101 | iowatcher: blkparse.o plot.o main.o tracers.o mpstat.o fio.o |
| 102 | - $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm |
| 103 | + $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm $(LDFLAGS) |
| 104 | |
| 105 | depend: |
| 106 | @$(CC) -MM $(ALL_CFLAGS) *.c 1> .depend |