summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Cummings <mcummings@gentoo.org>2007-03-04 13:40:52 +0000
committerMichael Cummings <mcummings@gentoo.org>2007-03-04 13:40:52 +0000
commit9252d5ba51bcb1d2a2af3670f3009ef04f9a3c70 (patch)
tree7cb03397964a1b73417624b672d2926b49e16462 /dev-lang/perl
parent* bump (diff)
downloadgentoo-2-9252d5ba51bcb1d2a2af3670f3009ef04f9a3c70.tar.gz
gentoo-2-9252d5ba51bcb1d2a2af3670f3009ef04f9a3c70.tar.bz2
gentoo-2-9252d5ba51bcb1d2a2af3670f3009ef04f9a3c70.zip
Bug 168312, patch from Peter for >=2.6.20 kernel headers.
(Portage version: 2.1.2-r9)
Diffstat (limited to 'dev-lang/perl')
-rw-r--r--dev-lang/perl/ChangeLog6
-rw-r--r--dev-lang/perl/files/perl-5.8.8-asm-page-h-compile-failure.patch12
-rw-r--r--dev-lang/perl/perl-5.8.8-r2.ebuild7
3 files changed, 23 insertions, 2 deletions
diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 82d4dfac6f3b..73a28de1911b 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-lang/perl
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.239 2007/02/11 14:15:44 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.240 2007/03/04 13:40:52 mcummings Exp $
+
+ 04 Mar 2007; Michael Cummings <mcummings@gentoo.org>
+ +files/perl-5.8.8-asm-page-h-compile-failure.patch, perl-5.8.8-r2.ebuild:
+ Bug 168312, patch from Peter for >=2.6.20 kernel headers.
11 Feb 2007; Fabian Groffen <grobian@gentoo.org> perl-5.8.8-r2.ebuild:
Dropped ppc-macos keyword, see you in prefix
diff --git a/dev-lang/perl/files/perl-5.8.8-asm-page-h-compile-failure.patch b/dev-lang/perl/files/perl-5.8.8-asm-page-h-compile-failure.patch
new file mode 100644
index 000000000000..325caafc8a44
--- /dev/null
+++ b/dev-lang/perl/files/perl-5.8.8-asm-page-h-compile-failure.patch
@@ -0,0 +1,12 @@
+--- perl-5.8.8/ext/IPC/SysV/SysV.xs.no_asm_page_h 2001-06-30 14:46:07.000000000 -0400
++++ perl-5.8.8/ext/IPC/SysV/SysV.xs 2006-06-02 17:37:22.000000000 -0400
+@@ -3,9 +3,6 @@
+ #include "XSUB.h"
+
+ #include <sys/types.h>
+-#ifdef __linux__
+-# include <asm/page.h>
+-#endif
+ #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM)
+ #ifndef HAS_SEM
+ # include <sys/ipc.h>
diff --git a/dev-lang/perl/perl-5.8.8-r2.ebuild b/dev-lang/perl/perl-5.8.8-r2.ebuild
index 478a19a3e225..5df6c73bbae3 100644
--- a/dev-lang/perl/perl-5.8.8-r2.ebuild
+++ b/dev-lang/perl/perl-5.8.8-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r2.ebuild,v 1.29 2007/02/11 14:15:44 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r2.ebuild,v 1.30 2007/03/04 13:40:52 mcummings Exp $
inherit eutils flag-o-matic toolchain-funcs multilib
@@ -126,6 +126,11 @@ src_unpack() {
has_version '>sys-devel/gcc-4.1.9999' && epatch ${FILESDIR}/${P}-gcc42-command-line.patch
+ # Newer linux-headers don't include asm/page.h. Fix this.
+ # Patch from bug 168312, thanks Peter!
+ has_version '>sys-kernel/linux-headers-2.6.20' && epatch ${FILESDIR}/${P}-asm-page-h-compile-failure.patch
+
+
}
myconf() {