diff options
-rw-r--r-- | tools/perf/Makefile.perf | 1 | ||||
-rw-r--r-- | tools/perf/config/Makefile | 6 | ||||
-rw-r--r-- | tools/perf/config/feature-checks/Makefile | 9 |
3 files changed, 9 insertions, 7 deletions
diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 87d7726cee2d..7257e7e9e38a 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf | |||
@@ -76,6 +76,7 @@ $(OUTPUT)PERF-VERSION-FILE: ../../.git/HEAD | |||
76 | 76 | ||
77 | CC = $(CROSS_COMPILE)gcc | 77 | CC = $(CROSS_COMPILE)gcc |
78 | AR = $(CROSS_COMPILE)ar | 78 | AR = $(CROSS_COMPILE)ar |
79 | PKG_CONFIG = $(CROSS_COMPILE)pkg-config | ||
79 | 80 | ||
80 | RM = rm -f | 81 | RM = rm -f |
81 | LN = ln -f | 82 | LN = ln -f |
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 01dd43df0d04..d604e50fc167 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile | |||
@@ -372,7 +372,7 @@ ifndef NO_SLANG | |||
372 | endif | 372 | endif |
373 | 373 | ||
374 | ifndef NO_GTK2 | 374 | ifndef NO_GTK2 |
375 | FLAGS_GTK2=$(CFLAGS) $(LDFLAGS) $(EXTLIBS) $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null) | 375 | FLAGS_GTK2=$(CFLAGS) $(LDFLAGS) $(EXTLIBS) $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) |
376 | ifneq ($(feature-gtk2), 1) | 376 | ifneq ($(feature-gtk2), 1) |
377 | msg := $(warning GTK2 not found, disables GTK2 support. Please install gtk2-devel or libgtk2.0-dev); | 377 | msg := $(warning GTK2 not found, disables GTK2 support. Please install gtk2-devel or libgtk2.0-dev); |
378 | NO_GTK2 := 1 | 378 | NO_GTK2 := 1 |
@@ -381,8 +381,8 @@ ifndef NO_GTK2 | |||
381 | GTK_CFLAGS := -DHAVE_GTK_INFO_BAR_SUPPORT | 381 | GTK_CFLAGS := -DHAVE_GTK_INFO_BAR_SUPPORT |
382 | endif | 382 | endif |
383 | CFLAGS += -DHAVE_GTK2_SUPPORT | 383 | CFLAGS += -DHAVE_GTK2_SUPPORT |
384 | GTK_CFLAGS += $(shell pkg-config --cflags gtk+-2.0 2>/dev/null) | 384 | GTK_CFLAGS += $(shell $(PKG_CONFIG) --cflags gtk+-2.0 2>/dev/null) |
385 | GTK_LIBS := $(shell pkg-config --libs gtk+-2.0 2>/dev/null) | 385 | GTK_LIBS := $(shell $(PKG_CONFIG) --libs gtk+-2.0 2>/dev/null) |
386 | EXTLIBS += -ldl | 386 | EXTLIBS += -ldl |
387 | endif | 387 | endif |
388 | endif | 388 | endif |
diff --git a/tools/perf/config/feature-checks/Makefile b/tools/perf/config/feature-checks/Makefile index 7cf6fcdacebe..12e551346fa6 100644 --- a/tools/perf/config/feature-checks/Makefile +++ b/tools/perf/config/feature-checks/Makefile | |||
@@ -28,7 +28,8 @@ FILES= \ | |||
28 | test-stackprotector-all.bin \ | 28 | test-stackprotector-all.bin \ |
29 | test-timerfd.bin | 29 | test-timerfd.bin |
30 | 30 | ||
31 | CC := $(CC) -MD | 31 | CC := $(CROSS_COMPILE)gcc -MD |
32 | PKG_CONFIG := $(CROSS_COMPILE)pkg-config | ||
32 | 33 | ||
33 | all: $(FILES) | 34 | all: $(FILES) |
34 | 35 | ||
@@ -37,7 +38,7 @@ BUILD = $(CC) $(CFLAGS) -o $(OUTPUT)$@ $(patsubst %.bin,%.c,$@) $(LDFLAGS) | |||
37 | ############################### | 38 | ############################### |
38 | 39 | ||
39 | test-all.bin: | 40 | test-all.bin: |
40 | $(BUILD) -Werror -fstack-protector-all -O2 -Werror -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -laudit -I/usr/include/slang -lslang $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl | 41 | $(BUILD) -Werror -fstack-protector-all -O2 -Werror -D_FORTIFY_SOURCE=2 -ldw -lelf -lnuma -lelf -laudit -I/usr/include/slang -lslang $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) $(FLAGS_PERL_EMBED) $(FLAGS_PYTHON_EMBED) -DPACKAGE='"perf"' -lbfd -ldl |
41 | 42 | ||
42 | test-hello.bin: | 43 | test-hello.bin: |
43 | $(BUILD) | 44 | $(BUILD) |
@@ -82,10 +83,10 @@ test-libslang.bin: | |||
82 | $(BUILD) -I/usr/include/slang -lslang | 83 | $(BUILD) -I/usr/include/slang -lslang |
83 | 84 | ||
84 | test-gtk2.bin: | 85 | test-gtk2.bin: |
85 | $(BUILD) $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null) | 86 | $(BUILD) $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) |
86 | 87 | ||
87 | test-gtk2-infobar.bin: | 88 | test-gtk2-infobar.bin: |
88 | $(BUILD) $(shell pkg-config --libs --cflags gtk+-2.0 2>/dev/null) | 89 | $(BUILD) $(shell $(PKG_CONFIG) --libs --cflags gtk+-2.0 2>/dev/null) |
89 | 90 | ||
90 | grep-libs = $(filter -l%,$(1)) | 91 | grep-libs = $(filter -l%,$(1)) |
91 | strip-libs = $(filter-out -l%,$(1)) | 92 | strip-libs = $(filter-out -l%,$(1)) |