summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHerbie Hopkins <herbs@gentoo.org>2005-09-05 14:40:43 +0000
committerHerbie Hopkins <herbs@gentoo.org>2005-09-05 14:40:43 +0000
commitc27dc9dc850afb07dcd92948f8eb11c23e5591a2 (patch)
treeb2e2a0f169613f76cbb96aacc1bfbcd6fa7b5001 /sys-devel
parentadd maildrop development version (p.masked). Stabilize 1.8.1-r1 on alpha and x86 (diff)
downloadgentoo-2-c27dc9dc850afb07dcd92948f8eb11c23e5591a2.tar.gz
gentoo-2-c27dc9dc850afb07dcd92948f8eb11c23e5591a2.tar.bz2
gentoo-2-c27dc9dc850afb07dcd92948f8eb11c23e5591a2.zip
More multilib fixes thanks to Christophe Saout, bug 104509.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'sys-devel')
-rw-r--r--sys-devel/libperl/ChangeLog5
-rw-r--r--sys-devel/libperl/Manifest30
-rw-r--r--sys-devel/libperl/libperl-5.8.7.ebuild9
3 files changed, 21 insertions, 23 deletions
diff --git a/sys-devel/libperl/ChangeLog b/sys-devel/libperl/ChangeLog
index a9e3924b6318..db1763322c89 100644
--- a/sys-devel/libperl/ChangeLog
+++ b/sys-devel/libperl/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-devel/libperl
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.79 2005/08/14 15:42:37 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/ChangeLog,v 1.80 2005/09/05 14:40:43 herbs Exp $
+
+ 05 Sep 2005; Herbie Hopkins <herbs@gentoo.org> libperl-5.8.7.ebuild:
+ More multilib fixes thanks to Christophe Saout, bug 104509.
14 Aug 2005; Michael Cummings <mcummings@gentoo.org> libperl-5.8.7.ebuild:
The rest of the patch for bug 58931
diff --git a/sys-devel/libperl/Manifest b/sys-devel/libperl/Manifest
index 73d98f6c1734..d5c9a5c115e8 100644
--- a/sys-devel/libperl/Manifest
+++ b/sys-devel/libperl/Manifest
@@ -1,27 +1,17 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ce6c15a55ad9d39caa3a46ac0ea9ff57 libperl-5.8.7.ebuild 10928
-MD5 79d28acc84fc5e84f8b2c19f26ab1864 ChangeLog 12155
MD5 faa9f545e3711c37ee78d83eb338eebb libperl-5.8.6.ebuild 10471
-MD5 0875c75155583aa2bec241b36265d371 libperl-5.8.5-r1.ebuild 10029
MD5 bf70b069d8a29b1cba1949437f7e8b0c libperl-5.8.5.ebuild 9920
-MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
MD5 be57b8457762771bc4b3018afd55d704 libperl-5.8.6-r1.ebuild 10463
-MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5-r1 64
-MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5 64
+MD5 9433652f4259dec0a5c2b1ad1697a1b3 libperl-5.8.7.ebuild 11077
+MD5 15c9def9377e1031ab690ac45e60faf4 ChangeLog 12289
+MD5 e2d8f1bf77722def1dd432e26455c818 metadata.xml 305
+MD5 0875c75155583aa2bec241b36265d371 libperl-5.8.5-r1.ebuild 10029
+MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-noksh.patch 611
+MD5 ce442db939c59218a16be167f793b817 files/libperl-uclibc.patch 573
MD5 f7324a62f22aabde3387b7e8a8b2106e files/libperl-reorder-INC.patch 1141
+MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-create-libperl-soname.patch 417
+MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5 64
MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-libperl-5.8.6 64
MD5 c10e44e47d7f702efe7d4009064a97ca files/digest-libperl-5.8.7 64
-MD5 ce442db939c59218a16be167f793b817 files/libperl-uclibc.patch 573
-MD5 0bdca74363c218d91a0db4ad1ea55485 files/libperl-create-libperl-soname.patch 417
-MD5 076dcbef37263d6dd7af719b55cfc2de files/libperl-noksh.patch 611
-MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.2-uclibc.patch 573
+MD5 c354e2fbf8141a769c20032e94f45fd3 files/digest-libperl-5.8.5-r1 64
MD5 0a07934d74ccb1133cf0f3650cb94efc files/digest-libperl-5.8.6-r1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC/2aDtG5z4I8BtQoRArhHAJ0TzDFYBvAPgFv8Zwx5ITzaj7dyVQCfRGBf
-jCduOHl03aUCr3lfAP3dzoo=
-=cc65
------END PGP SIGNATURE-----
+MD5 ce442db939c59218a16be167f793b817 files/libperl-5.8.2-uclibc.patch 573
diff --git a/sys-devel/libperl/libperl-5.8.7.ebuild b/sys-devel/libperl/libperl-5.8.7.ebuild
index 9eb1d01a394a..d7ba69386723 100644
--- a/sys-devel/libperl/libperl-5.8.7.ebuild
+++ b/sys-devel/libperl/libperl-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/sys-devel/libperl/libperl-5.8.7.ebuild,v 1.10 2005/08/14 15:42:37 mcummings Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/libperl/libperl-5.8.7.ebuild,v 1.11 2005/09/05 14:40:43 herbs Exp $
# The basic theory based on comments from Daniel Robbins <drobbins@gentoo.org>.
#
@@ -54,7 +54,7 @@
IUSE="berkdb debug gdbm ithreads"
-inherit eutils flag-o-matic toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs multilib
# The slot of this binary compat version of libperl.so
PERLSLOT="1"
@@ -211,6 +211,11 @@ src_compile() {
[[ ${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' \