diff options
author | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
---|---|---|
committer | Tudor Florea <tudor.florea@enea.com> | 2015-10-09 22:59:03 +0200 |
commit | 972dcfcdbfe75dcfeb777150c136576cf1a71e99 (patch) | |
tree | 97a61cd7e293d7ae9d56ef7ed0f81253365bb026 /meta/recipes-kernel/blktrace/blktrace/ldflags.patch | |
download | poky-972dcfcdbfe75dcfeb777150c136576cf1a71e99.tar.gz |
initial commit for Enea Linux 5.0 arm
Signed-off-by: Tudor Florea <tudor.florea@enea.com>
Diffstat (limited to 'meta/recipes-kernel/blktrace/blktrace/ldflags.patch')
-rw-r--r-- | meta/recipes-kernel/blktrace/blktrace/ldflags.patch | 93 |
1 files changed, 93 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..037d161340 --- /dev/null +++ b/meta/recipes-kernel/blktrace/blktrace/ldflags.patch | |||
@@ -0,0 +1,93 @@ | |||
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> | ||
12 | --- | ||
13 | Makefile | 11 ++++++----- | ||
14 | btreplay/Makefile | 3 ++- | ||
15 | btt/Makefile | 3 ++- | ||
16 | 3 files changed, 10 insertions(+), 7 deletions(-) | ||
17 | |||
18 | --- git.orig/Makefile | ||
19 | +++ git/Makefile | ||
20 | @@ -1,5 +1,6 @@ | ||
21 | CC = gcc | ||
22 | CFLAGS = -Wall -O2 -g -W | ||
23 | +LDFLAGS = | ||
24 | ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 | ||
25 | PROGS = blkparse blktrace verify_blkparse blkrawverify blkiomon | ||
26 | LIBS = -lpthread | ||
27 | @@ -23,19 +24,19 @@ btreplay/btreplay: | ||
28 | $(CC) -o $*.o -c $(ALL_CFLAGS) $< | ||
29 | |||
30 | blkparse: blkparse.o blkparse_fmt.o rbtree.o act_mask.o | ||
31 | - $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) | ||
32 | + $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS) | ||
33 | |||
34 | blktrace: blktrace.o act_mask.o | ||
35 | - $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) | ||
36 | + $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS) | ||
37 | |||
38 | verify_blkparse: verify_blkparse.o | ||
39 | - $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) | ||
40 | + $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS) | ||
41 | |||
42 | blkrawverify: blkrawverify.o | ||
43 | - $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) | ||
44 | + $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS) | ||
45 | |||
46 | blkiomon: blkiomon.o rbtree.o | ||
47 | - $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt | ||
48 | + $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) -lrt $(LDFLAGS) | ||
49 | |||
50 | $(PROGS): | depend | ||
51 | |||
52 | --- git.orig/btreplay/Makefile | ||
53 | +++ git/btreplay/Makefile | ||
54 | @@ -7,6 +7,7 @@ | ||
55 | |||
56 | CC = gcc | ||
57 | CFLAGS = -Wall -W -O2 -g | ||
58 | +LDFLAGS = | ||
59 | INCS = -I. -I.. -I../btt | ||
60 | OCFLAGS = -UCOUNT_IOS -UDEBUG -DNDEBUG | ||
61 | XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 | ||
62 | @@ -32,10 +33,10 @@ clean: docsclean | ||
63 | $(CC) $(CFLAGS) -c -o $*.o $< | ||
64 | |||
65 | btrecord: btrecord.o | ||
66 | - $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) | ||
67 | + $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS) | ||
68 | |||
69 | btreplay: btreplay.o | ||
70 | - $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) | ||
71 | + $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS) | ||
72 | |||
73 | depend: | ||
74 | @$(CC) -MM $(CFLAGS) *.c 1> .depend | ||
75 | --- git.orig/btt/Makefile | ||
76 | +++ git/btt/Makefile | ||
77 | @@ -7,6 +7,7 @@ | ||
78 | |||
79 | CC = gcc | ||
80 | CFLAGS = -Wall -W -O2 -g | ||
81 | +LDFLAGS = | ||
82 | INCS = -I. -I.. | ||
83 | XCFLAGS = -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 | ||
84 | override CFLAGS += $(INCS) $(XCFLAGS) | ||
85 | @@ -38,7 +39,7 @@ clean: docsclean | ||
86 | $(CC) $(CFLAGS) -c -o $*.o $< | ||
87 | |||
88 | btt: $(OBJS) | ||
89 | - $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) | ||
90 | + $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LIBS) $(LDFLAGS) | ||
91 | |||
92 | ifneq ($(wildcard .depend),) | ||
93 | include .depend | ||