perf: Remove hardcoded include paths for elfutils
PATCH RESEND 1/1 perf: Remove hardcoded include paths for elfutils
This change removes the use of hardcoded absolute "/usr/include/elfutils" paths from the perf build. The problem with hardcoded paths is that it prevents them from being overridden by $prefix or by -I in CFLAGS (e.g., for cross-compiling purposes).
Instead, just include the "elfutils/" subdirectory as a relative path when files are needed from that directory.
Tested by building perf:
- Cross-compiled for ARM on x86_64
- Built natively on x86_64
- Built on x86_64 with /usr/include/elfutils moved to another location and manually included in CFLAGS
--- tools/perf/Makefile | 4 ++-- tools/perf/feature-tests.mak | 4 ++-- tools/perf/util/probe-finder.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-)
tools/perf/Makefile +2 -2
@@ -507,7 +507,7 @@ PERFLIBS = $(LIB_FILE) -include config.mak ifndef NO_DWARF -FLAGS_DWARF=$(ALL_CFLAGS) -I/usr/include/elfutils -ldw -lelf $(ALL_LDFLAGS) $(EXTLIBS) +FLAGS_DWARF=$(ALL_CFLAGS) -ldw -lelf $(ALL_LDFLAGS) $(EXTLIBS) ifneq ($(call try-cc,$(SOURCE_DWARF),$(FLAGS_DWARF)),y) msg := $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev); NO_DWARF := 1
@@ -554,7 +554,7 @@ ifndef NO_DWARF ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined) msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled); else - BASIC_CFLAGS += -I/usr/include/elfutils -DDWARF_SUPPORT + BASIC_CFLAGS += -DDWARF_SUPPORT EXTLIBS += -lelf -ldw LIB_OBJS += $(OUTPUT)util/probe-finder.o endif # PERF_HAVE_DWARF_REGS
tools/perf/feature-tests.mak +2 -2
@@ -9,8 +9,8 @@ endef ifndef NO_DWARF define SOURCE_DWARF #include <dwarf.h> -#include <libdw.h> -#include <version.h> +#include <elfutils/libdw.h> +#include <elfutils/version.h> #ifndef _ELFUTILS_PREREQ #error #endif
tools/perf/util/probe-finder.h +3 -3
@@ -34,9 +34,9 @@ extern int find_available_vars_at(int fd, struct perf_probe_event *pev, bool externs);#include <dwarf.h> -#include <libdw.h> -#include <libdwfl.h> -#include <version.h> +#include <elfutils/libdw.h> +#include <elfutils/libdwfl.h> +#include <elfutils/version.h> struct probe_finder {struct perf_probe_event *pev;/* Target probe event */
Signature · 1 line
1.7.2.2
Quoted 7 lines · Robert Morell
This change removes the use of hardcoded absolute "
/usr/include/elfutils" paths from the perf build. The problem with hardcoded paths is that it prevents them from being overridden by $prefix or by -I in CFLAGS (e.g., for cross-compiling purposes).Instead, just include the "elfutils/" subdirectory as a relative path when files are needed from that directory.
Looks good to me, Thanks!
Quoted 8 lines
Tested by building perf:
- Cross-compiled for ARM onx86_64
- Built natively onx86_64
- Built onx86_64with/usr/include/elfutilsmoved to another location and manually included in CFLAGSSigned-off-by Robert Morell <[email protected]>
Quoted 60 lines
--- tools/perf/Makefile | 4 ++-- tools/perf/feature-tests.mak | 4 ++-- tools/perf/util/probe-finder.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-)tools/perf/Makefile +2
-2@@ -507,7 +507,7 @@ PERFLIBS = $(LIB_FILE) -include config.mak ifndef NO_DWARF -FLAGS_DWARF=$(ALL_CFLAGS) -I/usr/include/elfutils -ldw -lelf $(ALL_LDFLAGS) $(EXTLIBS) +FLAGS_DWARF=$(ALL_CFLAGS) -ldw -lelf $(ALL_LDFLAGS) $(EXTLIBS) ifneq ($(call try-cc,$(SOURCE_DWARF),$(FLAGS_DWARF)),y) msg := $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev); NO_DWARF := 1@@ -554,7 +554,7 @@ ifndef NO_DWARF ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined) msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled); else - BASIC_CFLAGS += -I/usr/include/elfutils -DDWARF_SUPPORT + BASIC_CFLAGS += -DDWARF_SUPPORT EXTLIBS += -lelf -ldw LIB_OBJS += $(OUTPUT)util/probe-finder.o endif # PERF_HAVE_DWARF_REGStools/perf/feature-tests.mak +2
-2@@ -9,8 +9,8 @@ endef ifndef NO_DWARF define SOURCE_DWARF #include <dwarf.h> -#include <libdw.h> -#include <version.h> +#include <elfutils/libdw.h> +#include <elfutils/version.h> #ifndef _ELFUTILS_PREREQ #error #endiftools/perf/util/probe-finder.h +3
-3@@ -34,9 +34,9 @@ extern int find_available_vars_at(int fd, struct perf_probe_event *pev, bool externs);#include <dwarf.h> -#include <libdw.h> -#include <libdwfl.h> -#include <version.h> +#include <elfutils/libdw.h> +#include <elfutils/libdwfl.h> +#include <elfutils/version.h> struct probe_finder {struct perf_probe_event *pev;/* Target probe event */
Signature · 4 lines
Masami HIRAMATSU 2nd Dept. Linux Technology Center Hitachi, Ltd., Systems Development Laboratory E-mail: [email protected]
Arnaldo Carvalho de Melo
AppliedEm Wed, Nov 17, 2010 at 11:11:15AM +0900, Masami Hiramatsu escreveu:
Quoted 18 lines
Quoted 7 lines · Robert Morell
This change removes the use of hardcoded absolute "
/usr/include/elfutils" paths from the perf build. The problem with hardcoded paths is that it prevents them from being overridden by $prefix or by -I in CFLAGS (e.g., for cross-compiling purposes).Instead, just include the "elfutils/" subdirectory as a relative path when files are needed from that directory.
Looks good to me, Thanks!
Quoted 7 lines
Tested by building perf:
- Cross-compiled for ARM onx86_64
- Built natively onx86_64
- Built onx86_64with/usr/include/elfutilsmoved to another location and manually included in CFLAGS
Quoted 3 lines
Quoted 1 line
Signed-off-by Robert Morell <[email protected]>Acked-by Masami Hiramatsu <[email protected]>
Thanks, applied,
- Arnaldo
[tip:perf/core] perf tools: Remove hardcoded include paths for elfutils
In reply to Robert MorellCommit-ID: a71123977eb3c72dd5a8bac723b13faf9cdd2828 Gitweb: http://git.kernel.org/tip/a71123977eb3c72dd5a8bac723b13faf9cdd2828 Author: Robert Morell <[email protected]> AuthorDate: Tue, 16 Nov 2010 14:16:33 -0800 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 19 Nov 2010 16:38:04 -0200
perf tools: Remove hardcoded include paths for elfutils
This change removes the use of hardcoded absolute "/usr/include/elfutils" paths from the perf build. The problem with hardcoded paths is that it prevents them from being overridden by $prefix or by -I in CFLAGS (e.g., for cross-compiling purposes).
Instead, just include the "elfutils/" subdirectory as a relative path when files are needed from that directory.
Tested by building perf:
- Cross-compiled for ARM on x86_64
- Built natively on x86_64
- Built on x86_64 with /usr/include/elfutils moved to another location and manually included in CFLAGS
LKML-Reference: <[email protected]>
--- tools/perf/Makefile | 4 ++-- tools/perf/feature-tests.mak | 4 ++-- tools/perf/util/probe-finder.h | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-)
tools/perf/Makefile +2 -2
@@ -507,7 +507,7 @@ PERFLIBS = $(LIB_FILE) -include config.mak ifndef NO_DWARF -FLAGS_DWARF=$(ALL_CFLAGS) -I/usr/include/elfutils -ldw -lelf $(ALL_LDFLAGS) $(EXTLIBS) +FLAGS_DWARF=$(ALL_CFLAGS) -ldw -lelf $(ALL_LDFLAGS) $(EXTLIBS) ifneq ($(call try-cc,$(SOURCE_DWARF),$(FLAGS_DWARF)),y) msg := $(warning No libdw.h found or old libdw.h found or elfutils is older than 0.138, disables dwarf support. Please install new elfutils-devel/libdw-dev); NO_DWARF := 1
@@ -554,7 +554,7 @@ ifndef NO_DWARF ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined) msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled); else - BASIC_CFLAGS += -I/usr/include/elfutils -DDWARF_SUPPORT + BASIC_CFLAGS += -DDWARF_SUPPORT EXTLIBS += -lelf -ldw LIB_OBJS += $(OUTPUT)util/probe-finder.o endif # PERF_HAVE_DWARF_REGS
tools/perf/feature-tests.mak +2 -2
@@ -9,8 +9,8 @@ endef ifndef NO_DWARF define SOURCE_DWARF #include <dwarf.h> -#include <libdw.h> -#include <version.h> +#include <elfutils/libdw.h> +#include <elfutils/version.h> #ifndef _ELFUTILS_PREREQ #error #endif
tools/perf/util/probe-finder.h +3 -3
@@ -34,9 +34,9 @@ extern int find_available_vars_at(int fd, struct perf_probe_event *pev, bool externs);#include <dwarf.h> -#include <libdw.h> -#include <libdwfl.h> -#include <version.h> +#include <elfutils/libdw.h> +#include <elfutils/libdwfl.h> +#include <elfutils/version.h> struct probe_finder {struct perf_probe_event *pev;/* Target probe event */