| 1 |
robbat2 13/12/26 23:15:50 |
| 2 |
|
| 3 |
Added: klibc-2.0.3-kernel-uapi.patch |
| 4 |
Log: |
| 5 |
Make it possible to build klibc with much newer kernels. |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-libs/klibc/files/klibc-2.0.3-kernel-uapi.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/klibc/files/klibc-2.0.3-kernel-uapi.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/klibc/files/klibc-2.0.3-kernel-uapi.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: klibc-2.0.3-kernel-uapi.patch |
| 16 |
=================================================================== |
| 17 |
Update header locations for uapi & generated |
| 18 |
|
| 19 |
In the v3.6 kernel, many of the headers were split out into a uapi variant. |
| 20 |
klibc should be using those variants to compile. |
| 21 |
|
| 22 |
There is also a generated subdir, to seperate out generated headers. |
| 23 |
|
| 24 |
The old kernel header location needs to be included as well, because |
| 25 |
linux/compiler.h is available only in the base include directory. |
| 26 |
|
| 27 |
Signed-off-by: Robin H. Johnson <robbat2@g.o> |
| 28 |
|
| 29 |
diff -Nuar klibc-2.0.3.orig/scripts/Kbuild.klibc klibc-2.0.3/scripts/Kbuild.klibc |
| 30 |
--- klibc-2.0.3.orig/scripts/Kbuild.klibc 2013-12-03 10:53:46.000000000 -0800 |
| 31 |
+++ klibc-2.0.3/scripts/Kbuild.klibc 2013-12-26 14:39:07.113906101 -0800 |
| 32 |
@@ -77,7 +77,10 @@ |
| 33 |
KLIBCCFLAGS := |
| 34 |
|
| 35 |
# Defaults for arch to override |
| 36 |
-KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include |
| 37 |
+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include/uapi \ |
| 38 |
+ -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include/generated/uapi \ |
| 39 |
+ -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include/generated \ |
| 40 |
+ -I$(KLIBCKERNELOBJ)/arch/$(KLIBCARCH)/include |
| 41 |
|
| 42 |
# Arch specific definitions for klibc |
| 43 |
include $(srctree)/$(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG |
| 44 |
@@ -116,6 +119,9 @@ |
| 45 |
-KLIBCCPPFLAGS += -I$(KLIBCKERNELSRC)/include \ |
| 46 |
+KLIBCCPPFLAGS += -I$(KLIBCKERNELSRC)/include/uapi \ |
| 47 |
+ -I$(KLIBCKERNELSRC)/include/generated/uapi \ |
| 48 |
+ -I$(KLIBCKERNELSRC)/include/generated \ |
| 49 |
+ -I$(KLIBCKERNELSRC)/include \ |
| 50 |
$(if $(KBUILD_SRC),-I$(KLIBCKERNELOBJ)/include2 \ |
| 51 |
-I$(KLIBCKERNELOBJ)/include -I$(srctree)/include) \ |
| 52 |
$(KLIBCARCHINCFLAGS) |
| 53 |
|
| 54 |
# klibc definitions |
| 55 |
diff -Nuar klibc-2.0.3.orig/usr/klibc/arch/i386/MCONFIG klibc-2.0.3/usr/klibc/arch/i386/MCONFIG |
| 56 |
--- klibc-2.0.3.orig/usr/klibc/arch/i386/MCONFIG 2013-12-03 10:53:46.000000000 -0800 |
| 57 |
+++ klibc-2.0.3/usr/klibc/arch/i386/MCONFIG 2013-12-26 14:44:56.349161344 -0800 |
| 58 |
@@ -34,3 +34,6 @@ |
| 59 |
|
| 60 |
# Asm includes for i386 are in the merged x86 tree |
| 61 |
-KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include |
| 62 |
+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include/uapi \ |
| 63 |
+ -I$(KLIBCKERNELOBJ)/arch/x86/include/generated/uapi \ |
| 64 |
+ -I$(KLIBCKERNELOBJ)/arch/x86/include/generated \ |
| 65 |
+ -I$(KLIBCKERNELOBJ)/arch/x86/include |
| 66 |
diff -Nuar klibc-2.0.3.orig/usr/klibc/arch/ppc/MCONFIG klibc-2.0.3/usr/klibc/arch/ppc/MCONFIG |
| 67 |
--- klibc-2.0.3.orig/usr/klibc/arch/ppc/MCONFIG 2013-12-03 10:53:46.000000000 -0800 |
| 68 |
+++ klibc-2.0.3/usr/klibc/arch/ppc/MCONFIG 2013-12-26 14:44:56.350161362 -0800 |
| 69 |
@@ -24,6 +24,9 @@ |
| 70 |
|
| 71 |
# The kernel so far has both asm-ppc* and asm-powerpc. |
| 72 |
-KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/powerpc/include |
| 73 |
+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/powerpc/include/uapi \ |
| 74 |
+ -I$(KLIBCKERNELOBJ)/arch/powerpc/include/generated/uapi \ |
| 75 |
+ -I$(KLIBCKERNELOBJ)/arch/powerpc/include/generated \ |
| 76 |
+ -I$(KLIBCKERNELOBJ)/arch/powerpc/include |
| 77 |
|
| 78 |
# The asm include files live in asm-powerpc |
| 79 |
KLIBCASMARCH = powerpc |
| 80 |
diff -Nuar klibc-2.0.3.orig/usr/klibc/arch/ppc64/MCONFIG klibc-2.0.3/usr/klibc/arch/ppc64/MCONFIG |
| 81 |
--- klibc-2.0.3.orig/usr/klibc/arch/ppc64/MCONFIG 2013-12-03 10:53:46.000000000 -0800 |
| 82 |
+++ klibc-2.0.3/usr/klibc/arch/ppc64/MCONFIG 2013-12-26 14:44:56.350161362 -0800 |
| 83 |
@@ -22,6 +22,9 @@ |
| 84 |
|
| 85 |
# The kernel so far has both asm-ppc* and asm-powerpc. |
| 86 |
-KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/powerpc/include |
| 87 |
+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/powerpc/include/uapi \ |
| 88 |
+ -I$(KLIBCKERNELOBJ)/arch/powerpc/include/generated/uapi \ |
| 89 |
+ -I$(KLIBCKERNELOBJ)/arch/powerpc/include/generated \ |
| 90 |
+ -I$(KLIBCKERNELOBJ)/arch/powerpc/include |
| 91 |
|
| 92 |
# The asm include files live in asm-powerpc |
| 93 |
KLIBCASMARCH = powerpc |
| 94 |
diff -Nuar klibc-2.0.3.orig/usr/klibc/arch/x86_64/MCONFIG klibc-2.0.3/usr/klibc/arch/x86_64/MCONFIG |
| 95 |
--- klibc-2.0.3.orig/usr/klibc/arch/x86_64/MCONFIG 2013-12-03 10:53:46.000000000 -0800 |
| 96 |
+++ klibc-2.0.3/usr/klibc/arch/x86_64/MCONFIG 2013-12-26 14:44:54.522128579 -0800 |
| 97 |
@@ -37,3 +37,6 @@ |
| 98 |
|
| 99 |
# Asm includes for x86_64 are in the merged x86 tree |
| 100 |
-KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include |
| 101 |
+KLIBCARCHINCFLAGS = -I$(KLIBCKERNELOBJ)/arch/x86/include/uapi \ |
| 102 |
+ -I$(KLIBCKERNELOBJ)/arch/x86/include/generated/uapi \ |
| 103 |
+ -I$(KLIBCKERNELOBJ)/arch/x86/include/generated \ |
| 104 |
+ -I$(KLIBCKERNELOBJ)/arch/x86/include |
Archives