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 | |
| 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
| -rw-r--r-- | fix-perf-build.patch | 35 | ||||
| -rw-r--r-- | kernel.spec | 11 |
2 files changed, 44 insertions, 2 deletions
diff --git a/fix-perf-build.patch b/fix-perf-build.patch new file mode 100644 index 000000000..c4e55ab58 --- /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 + diff --git a/kernel.spec b/kernel.spec index 6c98888c0..fb629f495 100644 --- a/kernel.spec +++ b/kernel.spec @@ -51,7 +51,7 @@ Summary: The Linux kernel # For non-released -rc kernels, this will be prepended with "0.", so # for example a 3 here will become 0.3 # -%global baserelease 1 +%global baserelease 2 %global fedora_build %{baserelease} # base_sublevel is the kernel version we're starting with and patching @@ -535,7 +535,7 @@ BuildRequires: xmlto, asciidoc BuildRequires: sparse >= 0.4.1 %endif %if %{with_tools} -BuildRequires: elfutils-devel zlib-devel binutils-devel newt-devel python-devel perl(ExtUtils::Embed) pciutils-devel +BuildRequires: elfutils-devel zlib-devel binutils-devel newt-devel python-devel perl(ExtUtils::Embed) pciutils-devel gettext %endif BuildConflicts: rhbuildsys(DiskFree) < 500Mb @@ -718,6 +718,7 @@ Patch12024: epoll-fix-spurious-lockdep-warnings.patch Patch12025: rcu-avoid-just-onlined-cpu-resched.patch Patch12026: block-stray-block-put-after-teardown.patch Patch12027: usb-add-quirk-for-logitech-webcams.patch +Patch12028: fix-perf-build.patch # Runtime power management @@ -1335,6 +1336,8 @@ ApplyPatch rcu-avoid-just-onlined-cpu-resched.patch ApplyPatch block-stray-block-put-after-teardown.patch ApplyPatch usb-add-quirk-for-logitech-webcams.patch +ApplyPatch fix-perf-build.patch + # Runtime PM #ApplyPatch linux-2.6-usb-pci-autosuspend.patch ### Broken by implicit notify support & ACPICA rebase @@ -2059,6 +2062,10 @@ fi # ||----w | # || || %changelog +* Thu Aug 18 2011 Josh Boyer <jwboyer@redhat.com> +- Add patch to fix perf build against rawhide glibc +- Add BR for gettext for cpupower translations + * Wed Aug 17 2011 Josh Boyer <jwboyer@redhat.com> - Linux 3.1-rc2-git4 - Create the kernel-tools subpackages based on a start by davej |