nptl fixes for amd64

5 files changed, 56 insertions, 23 deletions

diff --git a/sys-kernel/linux-headers/ChangeLog b/sys-kernel/linux-headers/ChangeLog
index 5bf8c736b949..4170c71b4f7f 100644
--- a/sys-kernel/linux-headers/ChangeLog
+++ b/sys-kernel/linux-headers/ChangeLog
@@ -1,12 +1,16 @@
 # ChangeLog for sys-kernel/linux-headers
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.65 2004/04/12 16:36:22 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/ChangeLog,v 1.66 2004/04/12 21:28:36 lv Exp $
 
   12 Apr 2004; Daniel Ahlberg <aliz@gentoo.org>
   linux-headers-2.4.21-r1.ebuild, linux-headers-2.4.21.ebuild,
   linux-headers-2.4.22.ebuild, linux-headers-2.4.23.ebuild:
   Add eutils to inherit, add IUSE=
 
+  04 Aug 2004; Travis Tilley <lv@gentoo.org> linux-headers-2.6.4.ebuild,
+  linux-headers-2.6.5.ebuild:
+  added a patch that allows glibc to compile with nptl support on amd64
+
   11 Apr 2004; Joshua Kinard <kumba@gentoo.org> linux-headers-2.0.40.ebuild,
   linux-headers-2.2.26.ebuild, linux-headers-2.4.21-r1.ebuild,
   linux-headers-2.4.21.ebuild, linux-headers-2.4.22.ebuild,
diff --git a/sys-kernel/linux-headers/Manifest b/sys-kernel/linux-headers/Manifest
index 42dabd9067fa..13c986598fd7 100644
--- a/sys-kernel/linux-headers/Manifest
+++ b/sys-kernel/linux-headers/Manifest
@@ -1,34 +1,35 @@
-MD5 1d5a7995afb46bd96648e3d93d68e2ba linux-headers-2.6.1.ebuild 4011
+MD5 896e1e70f9dee318f22506da3e8b25a2 ChangeLog 15681
+MD5 8a6645e983461e0063420dea2d31d067 linux-headers-2.2.26.ebuild 2495
+MD5 4394020931773ad1a3bcc55e28286c98 linux-headers-2.6.3-r1.ebuild 3901
+MD5 88cae4583ef199d12a952b41b17c358b linux-headers-2.6.4.ebuild 4052
+MD5 86b4bf58bc782160acf819518b789be7 linux-headers-2.6.5.ebuild 4060
 MD5 9ddae462555331453c2a533d43c3bae4 linux-headers-2.4.21-r1.ebuild 3800
 MD5 a0819c19063f6c33d83aa463589d292a linux-headers-2.4.21.ebuild 3586
-MD5 eb33a6438f5d5e8483f1711c155cec0c linux-headers-2.6.5.ebuild 3920
+MD5 44884aebc85bb6ef1c07825ac1d65940 linux-headers-2.4.22.ebuild 3878
 MD5 9044c5d4b3f79adec8a51303d34a7453 linux-headers-2.4.23.ebuild 3327
 MD5 63a871d5ad78f10e6f14c6dd68d7739c linux-headers-2.4.25.ebuild 3295
-MD5 8a6645e983461e0063420dea2d31d067 linux-headers-2.2.26.ebuild 2495
-MD5 fdec3ff702ae94c1135d9ff227219f42 ChangeLog 15507
+MD5 1d5a7995afb46bd96648e3d93d68e2ba linux-headers-2.6.1.ebuild 4011
 MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290
-MD5 8335c63033c68c15a5c4dfab20724b84 linux-headers-2.6.4.ebuild 3913
-MD5 4394020931773ad1a3bcc55e28286c98 linux-headers-2.6.3-r1.ebuild 3901
 MD5 809c408ee5bef5f61c54835a26cecf30 linux-headers-2.0.40.ebuild 1790
-MD5 44884aebc85bb6ef1c07825ac1d65940 linux-headers-2.4.22.ebuild 3878
-MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux-headers-2.6.0-fb.patch 386
-MD5 1f7aaa49614b3055b6110518b1ed23ee files/digest-linux-headers-2.6.1 66
-MD5 53405777e395f5520722f9fb2398ddd8 files/digest-linux-headers-2.6.4 66
-MD5 a8c4e44a323fbde21b9de3940e2ca5ef files/digest-linux-headers-2.6.5 66
-MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21-r1 67
-MD5 c33f70f0dc30a6fce5cfea06233defd4 files/linux-headers-2.6.3-appCompat.patch 17484
-MD5 7f5b6765680735a897bb2fb9e227f6b6 files/linux-headers-2.6.0-appCompat.patch 17983
-MD5 ec3d195f7d40d599802d5c0c5ad8f502 files/linux-headers-2.6.4-appCompat.patch 17240
-MD5 33d51532d0f696fefa15593b2cf2f6de files/digest-linux-headers-2.0.40 66
+MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
 MD5 556c7008fbfdf81750bbd4ab2beb111e files/digest-linux-headers-2.2.26 67
+MD5 aa9ba92e8479bdb5f69b03b5c72be866 files/linux-headers-2.6.4-unistd-nptl-fix.patch 362
 MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21 67
+MD5 9854e47afccae85e887bcb970fc68890 files/digest-linux-headers-2.4.21-r1 67
 MD5 6ef3887ee4018c06c18e8726767189c7 files/digest-linux-headers-2.4.22 67
 MD5 79ee1ad9f4629595cd8d0cd20ca56dc1 files/digest-linux-headers-2.4.23 67
 MD5 df6b4c19f4a4cb2b3d3a2a0107d7853d files/digest-linux-headers-2.4.25 67
-MD5 537c756a05fe1a6819277938d570b70a files/linux-headers-2.6.0-strict-ansi-fix.patch 1484
+MD5 1f7aaa49614b3055b6110518b1ed23ee files/digest-linux-headers-2.6.1 66
+MD5 1a3b49dce5bc80827496967e767a4a04 files/digest-linux-headers-2.6.3-r1 66
+MD5 53405777e395f5520722f9fb2398ddd8 files/digest-linux-headers-2.6.4 66
+MD5 a8c4e44a323fbde21b9de3940e2ca5ef files/digest-linux-headers-2.6.5 66
 MD5 c3e19cc983ab9e751bc4f5c391e66b0c files/generate-asm-sparc 1656
+MD5 7f5b6765680735a897bb2fb9e227f6b6 files/linux-headers-2.6.0-appCompat.patch 17983
+MD5 8a065c0dc3b8fac8747de35f1af75a2c files/linux-headers-2.6.0-fb.patch 386
+MD5 537c756a05fe1a6819277938d570b70a files/linux-headers-2.6.0-strict-ansi-fix.patch 1484
 MD5 a73786f0b9dda7e9ebacb91a192384f9 files/linux-headers-2.6.0-sysctl_h-compat.patch 352
-MD5 459bc20c4015796630e3a9f3dc9125e6 files/linux-headers-strict-ansi-fix.patch 1486
+MD5 c33f70f0dc30a6fce5cfea06233defd4 files/linux-headers-2.6.3-appCompat.patch 17484
 MD5 598136365858338b26557b7587c6725f files/linux-headers-2.6.3-strict-ansi-fix.patch 4166
-MD5 e300a3e148a7dcc38a0e099494fb6cb3 files/bigendian-byteorder-fix.patch 1557
-MD5 1a3b49dce5bc80827496967e767a4a04 files/digest-linux-headers-2.6.3-r1 66
+MD5 ec3d195f7d40d599802d5c0c5ad8f502 files/linux-headers-2.6.4-appCompat.patch 17240
+MD5 459bc20c4015796630e3a9f3dc9125e6 files/linux-headers-strict-ansi-fix.patch 1486
+MD5 33d51532d0f696fefa15593b2cf2f6de files/digest-linux-headers-2.0.40 66
diff --git a/sys-kernel/linux-headers/files/linux-headers-2.6.4-unistd-nptl-fix.patch b/sys-kernel/linux-headers/files/linux-headers-2.6.4-unistd-nptl-fix.patch
new file mode 100644
index 000000000000..8e418666d66d
--- /dev/null
+++ b/sys-kernel/linux-headers/files/linux-headers-2.6.4-unistd-nptl-fix.patch
@@ -0,0 +1,19 @@
+--- unistd-2.6.4.h	2004-04-12 08:33:06.000000000 -0400
++++ unistd.h	2004-08-04 21:58:41.947303328 -0400
+@@ -713,6 +713,8 @@
+ 
+ #endif /* __KERNEL_SYSCALLS__ */
+ 
++
++#ifdef __KERNEL__
+ #ifndef __ASSEMBLY__
+ 
+ #include <linux/linkage.h>
+@@ -731,6 +733,7 @@
+ 				size_t sigsetsize);
+ 
+ #endif	/* __ASSEMBLY__ */
++#endif  /* __KERNEL */
+ 
+ #endif /* __NO_STUBS */
+ 
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.4.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.4.ebuild
index 7199f5b98a86..854898c5cb52 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.4.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.4.ebuild,v 1.6 2004/04/11 21:37:13 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.4.ebuild,v 1.7 2004/04/12 21:28:36 lv Exp $
 
 ETYPE="headers"
 inherit kernel
@@ -56,6 +56,10 @@ src_unpack() {
 	epatch ${FILESDIR}/linux-headers-2.6.0-sysctl_h-compat.patch
 	epatch ${FILESDIR}/linux-headers-2.6.0-fb.patch
 
+	# Needed to compile NPTL on amd64
+	use amd64 && (cd ${S}/include/asm-x86_64/
+	epatch ${FILESDIR}/linux-headers-2.6.4-unistd-nptl-fix.patch)
+
 }
 
 src_compile() {
diff --git a/sys-kernel/linux-headers/linux-headers-2.6.5.ebuild b/sys-kernel/linux-headers/linux-headers-2.6.5.ebuild
index 4507a05e96e5..653eefc7f4fa 100644
--- a/sys-kernel/linux-headers/linux-headers-2.6.5.ebuild
+++ b/sys-kernel/linux-headers/linux-headers-2.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.5.ebuild,v 1.4 2004/04/11 21:37:13 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/linux-headers/linux-headers-2.6.5.ebuild,v 1.5 2004/04/12 21:28:36 lv Exp $
 
 ETYPE="headers"
 inherit kernel
@@ -56,6 +56,11 @@ src_unpack() {
 	epatch ${FILESDIR}/linux-headers-2.6.0-sysctl_h-compat.patch
 	epatch ${FILESDIR}/linux-headers-2.6.0-fb.patch
 
+	# Needed to compile NPTL on amd64
+	use amd64 && (cd ${S}/include/asm-x86_64/
+	epatch ${FILESDIR}/linux-headers-2.6.4-unistd-nptl-fix.patch)
+
+
 }
 
 src_compile() {