From 81e5b24c56dd281749737b5da999c3d61cfa539b Mon Sep 17 00:00:00 2001 From: Michael Cummings Date: Sun, 4 Mar 2007 13:40:52 +0000 Subject: [PATCH] Bug 168312, patch from Peter for >=2.6.20 kernel headers. Package-Manager: portage-2.1.2-r9 --- dev-lang/perl/ChangeLog | 6 +++- dev-lang/perl/Manifest | 30 ++++++++++++++----- ...erl-5.8.8-asm-page-h-compile-failure.patch | 12 ++++++++ dev-lang/perl/perl-5.8.8-r2.ebuild | 7 ++++- 4 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 dev-lang/perl/files/perl-5.8.8-asm-page-h-compile-failure.patch 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 + +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 perl-5.8.8-r2.ebuild: Dropped ppc-macos keyword, see you in prefix diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest index 783399f2d610..3cbb1f680091 100644 --- a/dev-lang/perl/Manifest +++ b/dev-lang/perl/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX perl-5.8.7-MakeMaker-RUNPATH.patch 859 RMD160 b0e95fcd9b1bbc085e9986f8910e3fbcf3f78eb2 SHA1 1e7c2f05ffaf8f6aee753ab106a9798e6920ff06 SHA256 3d327c525e0cf57899eca48d417fa4363f40da9b0d6b70b61e951521749047ab MD5 044b90a8895f8a03bef8e4cf5759eecc files/perl-5.8.7-MakeMaker-RUNPATH.patch 859 RMD160 b0e95fcd9b1bbc085e9986f8910e3fbcf3f78eb2 files/perl-5.8.7-MakeMaker-RUNPATH.patch 859 @@ -10,6 +13,10 @@ AUX perl-5.8.8-USE_MM_LD_RUN_PATH.patch 4963 RMD160 96dfe54660afdcbd24007ffce886 MD5 93a7b749eec75f6ba4bc7c4edf3a0ccd files/perl-5.8.8-USE_MM_LD_RUN_PATH.patch 4963 RMD160 96dfe54660afdcbd24007ffce886f667270694e7 files/perl-5.8.8-USE_MM_LD_RUN_PATH.patch 4963 SHA256 49527cd4272ba177b39562363bf34ec6c7b6e709ee6ac770b7fccc302d18b459 files/perl-5.8.8-USE_MM_LD_RUN_PATH.patch 4963 +AUX perl-5.8.8-asm-page-h-compile-failure.patch 384 RMD160 cb55d65bd1245019689f7a6241d313f45cc0ecda SHA1 69f7ee3d09abfba81d4b3976263b23491cb39f10 SHA256 b6be7b879d07a0f5a80ec775ce122d84a126a860471ccd86e4f32cbc2c90f704 +MD5 46376561e58c420b6654d905ca4e62c0 files/perl-5.8.8-asm-page-h-compile-failure.patch 384 +RMD160 cb55d65bd1245019689f7a6241d313f45cc0ecda files/perl-5.8.8-asm-page-h-compile-failure.patch 384 +SHA256 b6be7b879d07a0f5a80ec775ce122d84a126a860471ccd86e4f32cbc2c90f704 files/perl-5.8.8-asm-page-h-compile-failure.patch 384 AUX perl-5.8.8-cplusplus.patch 854 RMD160 1fbfc7ec9940622beb644ce0fa98a6f52131c9db SHA1 e4718e0b1c869ec56d59466caed3fab555848085 SHA256 ea1368e609b0d992b6cd5f92c327768d8c61ca2096826f26af2576263efb8a89 MD5 c3eeecbfcccfc4787f5157ad8b29ac7e files/perl-5.8.8-cplusplus.patch 854 RMD160 1fbfc7ec9940622beb644ce0fa98a6f52131c9db files/perl-5.8.8-cplusplus.patch 854 @@ -67,14 +74,14 @@ MD5 528fa2521c530d5a47df32b663e629af files/perl-regexp-nossp.patch 460 RMD160 dde3a25904275896e98d7b7f3a02926c8dbc5ca5 files/perl-regexp-nossp.patch 460 SHA256 e2d923711bb856b3c7f790dbc1cd1f468d647c1e50a3ff8a18745023c73b3e36 files/perl-regexp-nossp.patch 460 DIST perl-5.8.8.tar.bz2 10123359 RMD160 e78f26d9b96e6db35f946ad4ff55e3a69385c71b SHA1 4aab490040727ca4419098720eca2ba4367df539 SHA256 818a140d9c04ea8dab3a05104b34ced7f7d9d0a91bfed91baf89a84d0dfb1bc9 -EBUILD perl-5.8.8-r2.ebuild 18238 RMD160 68e4f1d3b93d9540c9f342825cb4775d183f4953 SHA1 28bf37e6b1f43611f4008ecb1626d71ddd0275e0 SHA256 5876d19021dd19cd91592cc4d65f9a2ad25fc21ace7d1fce2c6739280b889196 -MD5 35cec83ac8eb7bdbf6ec239f7c387552 perl-5.8.8-r2.ebuild 18238 -RMD160 68e4f1d3b93d9540c9f342825cb4775d183f4953 perl-5.8.8-r2.ebuild 18238 -SHA256 5876d19021dd19cd91592cc4d65f9a2ad25fc21ace7d1fce2c6739280b889196 perl-5.8.8-r2.ebuild 18238 -MISC ChangeLog 54444 RMD160 1b29e150d36eecebf55b010f04f492c43a97d4d3 SHA1 094a6de2a04bf665c850eb13b4c35a656836c52e SHA256 cca75a352506383fa078e33d20aa2af146bf39e0e47829da662b0921e5cd122e -MD5 c1adece7c5c491226b6d573a604ed709 ChangeLog 54444 -RMD160 1b29e150d36eecebf55b010f04f492c43a97d4d3 ChangeLog 54444 -SHA256 cca75a352506383fa078e33d20aa2af146bf39e0e47829da662b0921e5cd122e ChangeLog 54444 +EBUILD perl-5.8.8-r2.ebuild 18449 RMD160 e9cf9ed9784e9674b709701dc7b00c320a9b72f8 SHA1 5438ef2f0b2d23a4dbe3f3822abc154751bd2caa SHA256 fd2ec49b67328020de6dc1f0d6dbb8f32a8285abc190c42732b54d9785f37a49 +MD5 575fea647f62f34f4b184ae8dae4e6fa perl-5.8.8-r2.ebuild 18449 +RMD160 e9cf9ed9784e9674b709701dc7b00c320a9b72f8 perl-5.8.8-r2.ebuild 18449 +SHA256 fd2ec49b67328020de6dc1f0d6dbb8f32a8285abc190c42732b54d9785f37a49 perl-5.8.8-r2.ebuild 18449 +MISC ChangeLog 54638 RMD160 63b153b76810a7c46588ce4e00e7646821db24c9 SHA1 d3525f27edc78160e8578dd84c94d67414eb4a40 SHA256 a08fdf97a6b75dc4c1dc69a4ed1a91c35c9f33e5267fcb861d5b5f6183dfb63e +MD5 cb4502885b522ccfaa929c0bb6d42c27 ChangeLog 54638 +RMD160 63b153b76810a7c46588ce4e00e7646821db24c9 ChangeLog 54638 +SHA256 a08fdf97a6b75dc4c1dc69a4ed1a91c35c9f33e5267fcb861d5b5f6183dfb63e ChangeLog 54638 MISC metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 SHA1 99ef1deeae9a934fb6e46cf5fc4a5fcb8379a74a SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305 RMD160 647980838c590f54441a053916ea629e53e551c0 metadata.xml 305 @@ -82,3 +89,10 @@ SHA256 f05dbef15061919972882cab07057e102760a542beba17d131194091401cd7ca metadata MD5 750a1b4341f04665c5ce30e14a302f96 files/digest-perl-5.8.8-r2 241 RMD160 a339ac2a520b2fd2f458daf89cd89eb36a8c98b2 files/digest-perl-5.8.8-r2 241 SHA256 1067b25eabccaa2d61cfc9db27e31c6b18d075e440713e44dcde000c71bbf178 files/digest-perl-5.8.8-r2 241 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFF6sxqtG5z4I8BtQoRAg1eAJ9fHG6Kk32NOptcCcin748qejspXACfbx/E +yR5ITJOfG8WNU1KrC+jYHtk= +=QC1s +-----END PGP SIGNATURE----- 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 +-#ifdef __linux__ +-# include +-#endif + #if defined(HAS_MSG) || defined(HAS_SEM) || defined(HAS_SHM) + #ifndef HAS_SEM + # include 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() { -- 2.26.2