diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2011-08-18 08:14:20 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2011-08-18 08:14:20 -0400 |
| commit | 5106c6357312bfdf7b4fcd4d41aba0b111b2fb9e (patch) | |
| tree | b40984cedd4aa529b2058928c1b02c1259673441 /fix-perf-build.patch | |
| parent | 69fc02b694d6e1229060a0c60c47b88e6731289a (diff) | |
| download | kernel-5106c6357312bfdf7b4fcd4d41aba0b111b2fb9e.tar.gz kernel-5106c6357312bfdf7b4fcd4d41aba0b111b2fb9e.tar.xz kernel-5106c6357312bfdf7b4fcd4d41aba0b111b2fb9e.zip | |
Fix build against rawhide glibc and add BR for gettext
Diffstat (limited to 'fix-perf-build.patch')
| -rw-r--r-- | fix-perf-build.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/fix-perf-build.patch b/fix-perf-build.patch new file mode 100644 index 00000000..c4e55ab5 --- /dev/null +++ b/fix-perf-build.patch @@ -0,0 +1,35 @@ +From 602d6a279939ec30fc7f3ae9d10e3640854f77b2 Mon Sep 17 00:00:00 2001 +From: Josh Boyer <jwboyer@redhat.com> +Date: Thu, 18 Aug 2011 07:24:25 -0400 +Subject: [PATCH] Fix perf build against newer glibc + +Upstream glibc commit 295e904 added a definition for __attribute_const__ to +cdefs.h. This causes the following error when building perf: + +util/include/linux/compiler.h:8:0: error: "__attribute_const__" redefined [-Werror] +/usr/include/sys/cdefs.h:226:0: note: this is the location of the previous definition + +Wrap __attribute_const__ in #ifndef as we do for __always_inline. + +Signed-off-by: Josh Boyer <jwboyer@redhat.com> +--- + tools/perf/util/include/linux/compiler.h | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/tools/perf/util/include/linux/compiler.h b/tools/perf/util/include/linux/compiler.h +index 791f9dd..547628e 100644 +--- a/tools/perf/util/include/linux/compiler.h ++++ b/tools/perf/util/include/linux/compiler.h +@@ -5,7 +5,9 @@ + #define __always_inline inline + #endif + #define __user ++#ifndef __attribute_const__ + #define __attribute_const__ ++#endif + + #define __used __attribute__((__unused__)) + +-- +1.7.6 + |