diff options
| author |   Christian Hartmann <ian@gentoo.org> | 2007-11-18 17:37:25 +0000 |
|---|---|---|
| committer | Christian Hartmann <ian@gentoo.org> | 2007-11-18 17:37:25 +0000 |
| commit | 40035628bb441378339899e4e68501343fdce13c (patch) | |
| tree | 6fe0125da1ae1a7e83ffbf1efd77129c7952a979 /dev-lang/perl | |
| parent | Keyword ~amd64. (diff) | |
| download | gentoo-2-40035628bb441378339899e4e68501343fdce13c.tar.gz gentoo-2-40035628bb441378339899e4e68501343fdce13c.tar.bz2 gentoo-2-40035628bb441378339899e4e68501343fdce13c.zip | |
Reverting solars changes; bug #199518
(Portage version: 2.1.3.19)
Diffstat (limited to 'dev-lang/perl')
| -rw-r--r-- | dev-lang/perl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-lang/perl/perl-5.8.8-r2.ebuild | 11 | ||||
| -rw-r--r-- | dev-lang/perl/perl-5.8.8-r3.ebuild | 11 |
3 files changed, 11 insertions, 17 deletions
diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog index 2d0bfc2b6859..7fcfea0e28e7 100644 --- a/dev-lang/perl/ChangeLog +++ b/dev-lang/perl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-lang/perl # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.259 2007/11/18 07:04:34 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.260 2007/11/18 17:37:25 ian Exp $ + + 18 Nov 2007; Christian Hartmann <ian@gentoo.org> perl-5.8.8-r2.ebuild, + perl-5.8.8-r3.ebuild: + Reverting solars changes; bug #199518 18 Nov 2007; <solar@gentoo.org> -files/perl-5.8.8-lib64.patch, +files/perl-5.8.8-libbits.patch, perl-5.8.8-r2.ebuild, diff --git a/dev-lang/perl/perl-5.8.8-r2.ebuild b/dev-lang/perl/perl-5.8.8-r2.ebuild index 8c3bb974d093..20ae23e3d5b0 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.43 2007/11/18 07:04:34 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r2.ebuild,v 1.44 2007/11/18 17:37:25 ian Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -123,7 +123,8 @@ src_unpack() { # filter it otherwise configure fails. See #125535. epatch ${FILESDIR}/perl-hppa-pa7200-configure.patch - epatch ${FILESDIR}/${P}-libbits.patch + #[[ ${get_libdir} == lib64 ]] && cd ${S} && epatch ${FILESDIR}/${P}-lib64.patch + use amd64 || use ppc64 && cd ${S} && epatch ${FILESDIR}/${P}-lib64.patch [[ ${CHOST} == *-dragonfly* ]] && cd ${S} && epatch ${FILESDIR}/${P}-dragonfly-clean.patch [[ ${CHOST} == *-freebsd* ]] && cd ${S} && epatch ${FILESDIR}/${P}-fbsdhints.patch @@ -246,12 +247,6 @@ src_configure() { [[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a" - case "$(get_libdir)" in - lib) export BITS="";; - lib32) export BITS=32;; - lib64) export BITS=64;; - esac - if [[ $(get_libdir) != "lib" ]] ; then # We need to use " and not ', as the written config.sh use ' ... myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)" diff --git a/dev-lang/perl/perl-5.8.8-r3.ebuild b/dev-lang/perl/perl-5.8.8-r3.ebuild index 03d7b18cf3fb..55352b979b02 100644 --- a/dev-lang/perl/perl-5.8.8-r3.ebuild +++ b/dev-lang/perl/perl-5.8.8-r3.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-r3.ebuild,v 1.9 2007/11/18 07:04:34 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r3.ebuild,v 1.10 2007/11/18 17:37:25 ian Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -123,7 +123,8 @@ src_unpack() { # filter it otherwise configure fails. See #125535. epatch "${FILESDIR}"/perl-hppa-pa7200-configure.patch - epatch "${FILESDIR}"/${P}-libbits.patch + #[[ ${get_libdir} == lib64 ]] && cd ${S} && epatch ${FILESDIR}/${P}-lib64.patch + use amd64 || use ppc64 && cd "${S}" && epatch "${FILESDIR}"/${P}-lib64.patch [[ ${CHOST} == *-dragonfly* ]] && cd "${S}" && epatch "${FILESDIR}"/${P}-dragonfly-clean.patch [[ ${CHOST} == *-freebsd* ]] && cd "${S}" && epatch "${FILESDIR}"/${P}-fbsdhints.patch @@ -250,12 +251,6 @@ src_configure() { [[ ${ELIBC} == "FreeBSD" ]] && myconf "-Dlibc=/usr/$(get_libdir)/libc.a" - case "$(get_libdir)" in - lib) export BITS="";; - lib32) export BITS=32;; - lib64) export BITS=64;; - esac - if [[ $(get_libdir) != "lib" ]] ; then # We need to use " and not ', as the written config.sh use ' ... myconf "-Dlibpth=/usr/local/$(get_libdir) /$(get_libdir) /usr/$(get_libdir)" |