107 lines
3.0 KiB
Diff
107 lines
3.0 KiB
Diff
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>
|
|
|
|
--- 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
|
|
@@ -32,10 +33,10 @@ clean: docsclean
|
|
$(CC) $(CFLAGS) -c -o $*.o $<
|
|
|
|
btrecord: btrecord.o
|
|
- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^)
|
|
+ $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(LDFLAGS)
|
|
|
|
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
|
|
--- git.orig/iowatcher/Makefile
|
|
+++ git/iowatcher/Makefile
|
|
@@ -1,5 +1,6 @@
|
|
C = gcc
|
|
CFLAGS = -Wall -O0 -g -W
|
|
+LDFLAGS =
|
|
ALL_CFLAGS = $(CFLAGS) -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
|
|
|
|
PROGS = iowatcher
|
|
@@ -19,7 +20,7 @@ all: $(ALL)
|
|
$(CC) -o $*.o -c $(ALL_CFLAGS) $<
|
|
|
|
iowatcher: blkparse.o plot.o main.o tracers.o mpstat.o fio.o
|
|
- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm
|
|
+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm $(LDFLAGS)
|
|
|
|
depend:
|
|
@$(CC) -MM $(ALL_CFLAGS) *.c 1> .depend
|