diff options
| author |   Travis Tilley <lv@gentoo.org> | 2004-04-12 21:28:36 +0000 |
|---|---|---|
| committer | Travis Tilley <lv@gentoo.org> | 2004-04-12 21:28:36 +0000 |
| commit | fef529f200be828c54d6037549e61f628521e2c2 (patch) | |
| tree | 404471c8cf95a6e25f46cfc04c2d053f68ccbe94 /sys-kernel | |
| parent | spelling fix (Manifest recommit) (diff) | |
| download | gentoo-2-fef529f200be828c54d6037549e61f628521e2c2.tar.gz gentoo-2-fef529f200be828c54d6037549e61f628521e2c2.tar.bz2 gentoo-2-fef529f200be828c54d6037549e61f628521e2c2.zip | |
nptl fixes for amd64
Diffstat (limited to 'sys-kernel')
4 files changed, 35 insertions, 3 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/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() { |