This is a note to let you know that I've just added the patch titled
perf tools: Display better error messages on missing packages
to the 2.6.32-longterm tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/longterm/longterm-queue-2.6.32.git;a=summary
The filename of the patch is:
perf-tools-display-better-error-messages-on-missing-.patch
and it can be found in the queue-2.6.32 subdirectory.
If you, or anyone else, feels it should not be added to the 2.6.32 longterm
tree,
please let <[email protected]> know about it.
>From cf963cf8d20172ff0ad5b754fa59c085d28b93de Mon Sep 17 00:00:00 2001
From: Randy Dunlap <[email protected]>
Date: Sun, 18 Oct 2009 19:20:24 -0700
Subject: perf tools: Display better error messages on missing packages
From: Randy Dunlap <[email protected]>
commit 1abc7f5500fff8422f34826a006648d8741d83d3 upstream.
Check for libelf headers and glibc headers separately so that
the error message correctly identifies which package
installation is missing/needed.
Signed-off-by: Randy Dunlap <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Cc: Arnaldo Carvalho de Melo <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
[bwh: Backport to 2.6.32]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
tools/perf/Makefile | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -423,12 +423,16 @@ ifeq ($(uname_S),Darwin)
PTHREAD_LIBS =
endif
+ifneq ($(shell sh -c "(echo '\#include <gnu/libc-version.h>'; echo 'int
main(void) { const char * version = gnu_get_libc_version(); return
(long)version; }') | $(CC) -x c - $(ALL_CFLAGS) -D_LARGEFILE64_SOURCE
-D_FILE_OFFSET_BITS=64 -o /dev/null $(ALL_LDFLAGS) > /dev/null 2>&1 && echo
y"), y)
+ msg := $(error No gnu/libc-version.h found, please install
glibc-dev[el]);
+endif
+
ifeq ($(shell sh -c "(echo '\#include <libelf.h>'; echo 'int main(void) { Elf
* elf = elf_begin(0, ELF_C_READ, 0); return (long)elf; }') | $(CC) -x c -
$(ALL_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o /dev/null
$(ALL_LDFLAGS) > /dev/null 2>&1 && echo y"), y)
ifneq ($(shell sh -c "(echo '\#include <libelf.h>'; echo 'int
main(void) { Elf * elf = elf_begin(0, ELF_C_READ_MMAP, 0); return (long)elf;
}') | $(CC) -x c - $(ALL_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-o /dev/null $(ALL_LDFLAGS) > /dev/null 2>&1 && echo y"), y)
BASIC_CFLAGS += -DLIBELF_NO_MMAP
endif
else
- msg := $(error No libelf.h/libelf found, please install
libelf-dev/elfutils-libelf-devel and glibc-dev[el]);
+ msg := $(error No libelf.h/libelf found, please install
libelf-dev/elfutils-libelf-devel);
endif
ifdef NO_DEMANGLE
Patches currently in longterm-queue-2.6.32 which might be from
[email protected] are
/home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/perf-tools-display-better-error-messages-on-missing-.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/mmc-build-fix-mmc_pm_notify-is-only-available-with-c.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable
