[kernel/f17] Add patch to fix 32-bit turbostat build with older glibc-headers

Josh Boyer jwboyer at fedoraproject.org
Fri Mar 8 20:52:44 UTC 2013


commit 49decd0917b241e30f5a44989d3776fbe13b5f07
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Fri Mar 8 15:47:15 2013 -0500

    Add patch to fix 32-bit turbostat build with older glibc-headers
    
    glibc-2.15 32-bit sigcontext.h pulls in asm/sigcontext.h.  Because turbostat
    is using -I to point to the kernel source UAPI dir, we get an error about
    linux/compiler.h not being found.  That's true, because the kernel doesn't
    export linux/compiler.h and it's stripped out of the uapi sigcontext.h file
    when we export it.  But that doesn't help us when turbostat is being stupid
    and pointing at the pre-stripped UAPI headers.  Just what.
    
    So just point it to the top level kernel include directory after it's already
    searched everything else.

 kernel.spec             |    9 ++++++++-
 turbostat-makefile.diff |   11 +++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 6d3014e..cc58a9c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -761,6 +761,8 @@ Patch24101: fix-destroy_conntrack-GPF.patch
 #rhbz 917353
 Patch24102: backlight_revert.patch
 
+Patch24103: turbostat-makefile.diff
+
 # END OF PATCH DEFINITIONS
 
 %endif
@@ -1480,6 +1482,8 @@ ApplyPatch net-sctp-Validate-parameter-size-for-SCTP_GET_ASSOC_.patch
 #rhbz 917353
 ApplyPatch backlight_revert.patch -R
 
+ApplyPatch turbostat-makefile.diff
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -2336,7 +2340,10 @@ fi
 #    '-'      |  |
 #              '-'
 %changelog
-* Fri Mar 08 2013 Justin M. Forbes <jforbes at redhat.com> - 3.8.2-105
+* Fri Mar 08 2013 Josh Boyer <jwboyer at redhat.com> - 3.8.2-105
+- Add patch to fix 32-bit turbostat build with older glibc-headers
+
+* Fri Mar 08 2013 Justin M. Forbes <jforbes at redhat.com>
 - Revert "write backlight harder" until better solution is found (rhbz 917353)
 
 * Fri Mar 08 2013 Josh Boyer <jwboyer at redhat.com>
diff --git a/turbostat-makefile.diff b/turbostat-makefile.diff
new file mode 100644
index 0000000..4732687
--- /dev/null
+++ b/turbostat-makefile.diff
@@ -0,0 +1,11 @@
+--- a/tools/power/x86/turbostat/Makefile	2013-03-08 15:42:39.274393369 -0500
++++ b/tools/power/x86/turbostat/Makefile	2013-03-08 15:41:59.162486862 -0500
+@@ -5,7 +5,7 @@ DESTDIR		:=
+ 
+ turbostat : turbostat.c
+ CFLAGS +=	-Wall
+-CFLAGS +=	-I../../../../arch/x86/include/uapi/
++CFLAGS +=	-I../../../../arch/x86/include/uapi/ -idirafter ../../../../include/
+ 
+ %: %.c
+ 	@mkdir -p $(BUILD_OUTPUT)


More information about the scm-commits mailing list