diff options
author | Fahad Usman <fahad_usman@mentor.com> | 2012-12-20 17:40:32 +0500 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2012-12-25 14:00:20 -0800 |
commit | 8d5fa8f26e4cc366ac566d3682bd74eb4578cc6d (patch) | |
tree | 476a2bfc67ca2609f87d852fbd362f61dfe01bf9 /meta/recipes-kernel/blktrace/blktrace/ldflags.patch | |
parent | 23e6431687a5602a7e579c546a69008954f64620 (diff) | |
download | openembedded-core-contrib-8d5fa8f26e4cc366ac566d3682bd74eb4578cc6d.tar.gz |
blktrace: essentially rework the recipe, obey LDFLAGS
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
the patch was imported from meta-mentor layer on yoctoproject git server
http://git.yoctoproject.org/cgit/cgit.cgi/meta-mentor as of commit id
aed463414e2e2bf8ca44ba54ee5973e7ed599e57
Signed-off-by: Fahad Usman <fahad_usman@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-kernel/blktrace/blktrace/ldflags.patch')
-rw-r--r-- | meta/recipes-kernel/blktrace/blktrace/ldflags.patch | 89 |
1 files changed, 89 insertions, 0 deletions
diff --git a/meta/recipes-kernel/blktrace/blktrace/ldflags.patch b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch new file mode 100644 index 0000000000..b9c7c20c2b --- /dev/null +++ b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch @@ -0,0 +1,89 @@ +blktrace: obey LDFLAGS + +Upstream-Status: Pending + +Signed-off-by: Christopher Larson <chris_larson@mentor.com> + +the patch was imported from meta-mentor layer on yoctoproject git server +http://git.yoctoproject.org/cgit/cgit.cgi/meta-mentor as of commit id +aed463414e2e2bf8ca44ba54ee5973e7ed599e57 + +Signed-off-by: Fahad Usman <fahad_usman@mentor.com> +--- + Makefile | 11 ++++++----- + btreplay/Makefile | 3 ++- + btt/Makefile | 3 ++- + 3 files changed, 10 insertions(+), 7 deletions(-) + +--- git.orig/Makefile ++++ git/Makefile +@@ -1,5 +1,6 @@ + CC = gcc + CFLAGS = -Wall -O2 -g -W ++LDFLAGS = + ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 + PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon + LIBS = -lpthread +@@ -23,19 +24,19 @@ btreplay/btreplay: + $(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) -o $@ $(filter %.o,$^) $(LDFLAGS) + + blktrace: blktrace.o act_mask.o +- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) ++ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS) + + verify_blkparse: verify_blkparse.o +- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) ++ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS) + + blkrawverify: blkrawverify.o +- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) ++ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS) + + blkiomon: blkiomon.o rbtree.o +- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt ++ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt $(LDFLAGS) + + $(PROGS): | depend + +--- git.orig/btreplay/Makefile ++++ git/btreplay/Makefile +@@ -7,6 +7,7 @@ + + CC = gcc + CFLAGS = -Wall -W -O2 -g ++LDFLAGS = + INCS = -I. -I.. -I../btt + OCFLAGS = -UCOUNT_IOS -UDEBUG -DNDEBUG + XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +@@ -35,7 +36,7 @@ btrecord: btrecord.o + $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) + + btreplay: btreplay.o +- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) ++ $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS) + + depend: + @$(CC) -MM $(CFLAGS) *.c 1> .depend +--- git.orig/btt/Makefile ++++ git/btt/Makefile +@@ -7,6 +7,7 @@ + + CC = gcc + CFLAGS = -Wall -W -O2 -g ++LDFLAGS = + INCS = -I. -I.. + XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 + override CFLAGS += $(INCS) $(XCFLAGS) +@@ -38,7 +39,7 @@ clean: docsclean + $(CC) $(CFLAGS) -c -o $*.o $< + + btt: $(OBJS) +- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) ++ $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS) + + ifneq ($(wildcard .depend),) + include .depend |