diff options
author | Herbie Hopkins <herbs@gentoo.org> | 2005-09-05 14:46:39 +0000 |
---|---|---|
committer | Herbie Hopkins <herbs@gentoo.org> | 2005-09-05 14:46:39 +0000 |
commit | 6ca8b59e5fef02749edd0caa132543dd20701025 (patch) | |
tree | 259309cfdb3311e6906b1be90e8aade4a27863a3 /dev-lang | |
parent | Marking 2.6.4-r2 stable (x86) (diff) | |
download | gentoo-2-6ca8b59e5fef02749edd0caa132543dd20701025.tar.gz gentoo-2-6ca8b59e5fef02749edd0caa132543dd20701025.tar.bz2 gentoo-2-6ca8b59e5fef02749edd0caa132543dd20701025.zip |
More multilib fixes thanks to Christophe Saout, bug 104509.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'dev-lang')
-rw-r--r-- | dev-lang/perl/ChangeLog | 5 | ||||
-rw-r--r-- | dev-lang/perl/Manifest | 40 | ||||
-rw-r--r-- | dev-lang/perl/perl-5.8.7.ebuild | 7 |
3 files changed, 25 insertions, 27 deletions
diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog index 5348ba24c7c0..9effebb051f6 100644 --- a/dev-lang/perl/ChangeLog +++ b/dev-lang/perl/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-lang/perl # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.151 2005/09/04 11:49:15 beu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.152 2005/09/05 14:46:38 herbs Exp $ + + 05 Sep 2005; Herbie Hopkins <herbs@gentoo.org> perl-5.8.7.ebuild: + More multilib fixes thanks to Christophe Saout, bug 104509. 04 Sep 2005; Elfyn McBratney <beu@gentoo.org> files/perl-5.8.7-regexp-nossp.patch: diff --git a/dev-lang/perl/Manifest b/dev-lang/perl/Manifest index 1a191a8b5858..8333e18ee0f6 100644 --- a/dev-lang/perl/Manifest +++ b/dev-lang/perl/Manifest @@ -1,35 +1,25 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 d9dff60a26106a24dd9d315f82f0719d perl-5.8.7.ebuild 19097 +MD5 b9e4256f971f7707daa9eb7ad62507a6 perl-5.8.7.ebuild 19237 MD5 933d62fc4adab220ae0707bf6ba26f25 perl-5.8.6-r5.ebuild 17611 +MD5 0221274a2228bab1c8419eb27a39f349 ChangeLog 42444 MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305 -MD5 2e2c376f0953048ce02aa8081c7ebbb5 ChangeLog 42313 -MD5 ce442db939c59218a16be167f793b817 files/perl-uclibc.patch 573 -MD5 01af75daf3d222a668059e90d78a1f9d files/perl-nonblock.patch 400 -MD5 2bd41aec5e22962224dc9376e27bdde3 files/CAN-2005-0448-rmtree.patch 7629 -MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r5 64 MD5 26a1e7c48c7f68f39db4262500f6a1d8 files/perl-5.8.7-tempfiles.patch 1007 MD5 319b56a7ce715fb7a494fe4d5cb9474c files/perl-picdl.patch 250 -MD5 528fa2521c530d5a47df32b663e629af files/perl-5.8.7-regexp-nossp.patch 460 MD5 f98759a75347e0b54190850b8295c2cb files/perl-tempfiles.patch 2023 -MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-noksh.patch 611 -MD5 c5cc36940b2488a37c3dc2287f6e672c files/perl-5.8.6-tempfiles.patch 2115 -MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-h2ph-ansi-header.patch 446 -MD5 c2612d59f380ad6e0c2de4d941e83dfd files/perl-cleaner 8879 -MD5 4e99f7529e149661372283c981cf17ff files/perl-prelink-lpthread.patch 476 MD5 f7324a62f22aabde3387b7e8a8b2106e files/perl-reorder-INC.patch 1141 -MD5 154013a841cbb251d7b63fb006b4006f files/file_path_rmtree.patch 1068 +MD5 4e99f7529e149661372283c981cf17ff files/perl-prelink-lpthread.patch 476 +MD5 076dcbef37263d6dd7af719b55cfc2de files/perl-noksh.patch 611 +MD5 01af75daf3d222a668059e90d78a1f9d files/perl-nonblock.patch 400 MD5 bd75f0242e3b7791803d089c38a3f920 files/CAN-2005-0156-suid.patch 703 +MD5 c2612d59f380ad6e0c2de4d941e83dfd files/perl-cleaner 8879 MD5 5dfd23c2236b382d031a9513bc12f3f1 files/perl-5.8.5-tempfiles.patch 2113 -MD5 44e1f1420947cc552c66fb434ba4c855 files/perl-5.8.4-NDBM-GDBM-compat.patch 428 +MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-perldoc-emptydirs.patch 489 MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-perl-5.8.7 64 MD5 fd8a46de4b22dbf9146a6d0459e812c4 files/perl-5.8.7-CAN-2005-0448-rmtree.patch 6961 -MD5 0a28eb41f5f12ed54f025004af45c83d files/perl-perldoc-emptydirs.patch 489 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2 (GNU/Linux) - -iD8DBQFDGu18jUHll2nfF60RAhLbAJ94DOoI36sC9ondFAfazvveZxEg9ACgsyoN -QrmZBJZ7XA1TNI1vheI91DM= -=lRi5 ------END PGP SIGNATURE----- +MD5 ce442db939c59218a16be167f793b817 files/perl-uclibc.patch 573 +MD5 c5cc36940b2488a37c3dc2287f6e672c files/perl-5.8.6-tempfiles.patch 2115 +MD5 2bd41aec5e22962224dc9376e27bdde3 files/CAN-2005-0448-rmtree.patch 7629 +MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-perl-5.8.6-r5 64 +MD5 060e9f10466fdc1268c75a7cf4dcbc7c files/perl-h2ph-ansi-header.patch 446 +MD5 528fa2521c530d5a47df32b663e629af files/perl-5.8.7-regexp-nossp.patch 460 +MD5 44e1f1420947cc552c66fb434ba4c855 files/perl-5.8.4-NDBM-GDBM-compat.patch 428 +MD5 154013a841cbb251d7b63fb006b4006f files/file_path_rmtree.patch 1068 diff --git a/dev-lang/perl/perl-5.8.7.ebuild b/dev-lang/perl/perl-5.8.7.ebuild index 6aaa78e87349..c6048a1af763 100644 --- a/dev-lang/perl/perl-5.8.7.ebuild +++ b/dev-lang/perl/perl-5.8.7.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.7.ebuild,v 1.11 2005/09/04 06:22:00 beu Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.7.ebuild,v 1.12 2005/09/05 14:46:39 herbs Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -218,6 +218,11 @@ src_configure() { [[ ${ELIBC} == "FreeBSD" ]] && myconf="${myconf} -Dlibc=/usr/lib/libc.a" + if [[ $(get_libdir) != "lib" ]] ; then + myconf="${myconf} -Dlibpth='/usr/local/$(get_libdir) /$(get_libdir) \ + /usr/$(get_libdir)'" + fi + sh Configure -des \ -Darchname="${myarch}" \ -Dcccdlflags='-fPIC' \ |