diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-03-11 21:47:17 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2009-03-11 21:47:17 +0000 |
| commit | 031c08468f30274e4f5a7fc7001e681807e48960 (patch) | |
| tree | 15d11d03d0322e56f56205e8f266825e27fc7ea9 /dev-lang/perl | |
| parent | Stable on alpha, bug #246816 (diff) | |
| download | gentoo-2-031c08468f30274e4f5a7fc7001e681807e48960.tar.gz gentoo-2-031c08468f30274e4f5a7fc7001e681807e48960.tar.bz2 gentoo-2-031c08468f30274e4f5a7fc7001e681807e48960.zip | |
Fix logic for applying the lib64 patch, use get_libdir to decide (should fix 32-bit userland profiles).
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang/perl')
| -rw-r--r-- | dev-lang/perl/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-lang/perl/perl-5.8.8-r6.ebuild | 9 |
2 files changed, 10 insertions, 6 deletions
diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog index 182560d8e5d3..7056cb3b9acc 100644 --- a/dev-lang/perl/ChangeLog +++ b/dev-lang/perl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/perl # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.275 2009/01/28 09:54:09 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.276 2009/03/11 21:47:17 flameeyes Exp $ + + 11 Mar 2009; Diego E. Pettenò <flameeyes@gentoo.org> + perl-5.8.8-r6.ebuild: + Fix logic for applying the lib64 patch, use get_libdir to decide (should + fix 32-bit userland profiles). *perl-5.8.8-r6 (28 Jan 2009) diff --git a/dev-lang/perl/perl-5.8.8-r6.ebuild b/dev-lang/perl/perl-5.8.8-r6.ebuild index 7ac0c9eab671..02c3fa42ae5e 100644 --- a/dev-lang/perl/perl-5.8.8-r6.ebuild +++ b/dev-lang/perl/perl-5.8.8-r6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 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-r6.ebuild,v 1.1 2009/01/28 09:54:09 tove Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.8-r6.ebuild,v 1.2 2009/03/11 21:47:17 flameeyes Exp $ inherit eutils flag-o-matic toolchain-funcs multilib @@ -123,8 +123,7 @@ src_unpack() { # filter it otherwise configure fails. See #125535. epatch "${FILESDIR}"/perl-hppa-pa7200-configure.patch - #[[ ${get_libdir} == lib64 ]] && cd ${S} && epatch ${FILESDIR}/${P}-lib64.patch - use amd64 || use ppc64 && cd "${S}" && epatch "${FILESDIR}"/${P}-lib64.patch + [[ $(get_libdir) == lib64 ]] && 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 @@ -344,7 +343,7 @@ EOF # This is to fix a missing c flag for backwards compat for i in `find "${D}"/usr/$(get_libdir)/perl5 -iname "Config.pm"`;do sed -e "s:ccflags=':ccflags='-DPERL5 :" \ - -e "s:cppflags=':cppflags='-DPERL5 :" \ + -e "s:cppflags=':cppflags='-DPERL5 :" \ ${i} > ${i}.new &&\ mv ${i}.new ${i} || die "Sed failed" done @@ -609,7 +608,7 @@ pkg_postinst() { # Silently remove the now empty dirs for DIR in $INC; do if [[ -d "${ROOT}"/$DIR ]]; then - find "${ROOT}"/$DIR -depth -type d | xargs -r rmdir &> /dev/null + find "${ROOT}"/$DIR -depth -type d | xargs -r rmdir &> /dev/null fi done ebegin "Generating ConfigLocal.pm (ignore any error)" |