diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-10-07 10:19:06 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-10-07 10:19:06 +0000 |
| commit | b80e38a739168d7fa1cd68d46417b430b046f75e (patch) | |
| tree | 25947572bac0fe7efaf802f29c4b6b4cd94a20e2 /sys-libs | |
| parent | x86 and ppc stable. removed old versions. QA fixes (install and copyright doc... (diff) | |
| download | gentoo-2-b80e38a739168d7fa1cd68d46417b430b046f75e.tar.gz gentoo-2-b80e38a739168d7fa1cd68d46417b430b046f75e.tar.bz2 gentoo-2-b80e38a739168d7fa1cd68d46417b430b046f75e.zip | |
Don't do get_libdir on crosscompiles except for mips64 since it breaks other targets and only mildly fixes mips64.
(Portage version: 2.0.53_rc3)
Diffstat (limited to 'sys-libs')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.5-r2.ebuild | 12 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.5.20050722.ebuild | 12 |
3 files changed, 24 insertions, 7 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index f806d70754a0..f50bf877645d 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.394 2005/10/07 05:11:11 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.395 2005/10/07 10:19:06 eradicator Exp $ + + 07 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org> + glibc-2.3.5-r2.ebuild, glibc-2.3.5.20050722.ebuild: + Don't do get_libdir on crosscompiles except for mips64 since it breaks other + targets and only mildly fixes mips64. 07 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org> glibc-2.3.5-r2.ebuild, glibc-2.3.5.20050421.ebuild, diff --git a/sys-libs/glibc/glibc-2.3.5-r2.ebuild b/sys-libs/glibc/glibc-2.3.5-r2.ebuild index b5b58d27c47c..f515d4714ea4 100644 --- a/sys-libs/glibc/glibc-2.3.5-r2.ebuild +++ b/sys-libs/glibc/glibc-2.3.5-r2.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-libs/glibc/glibc-2.3.5-r2.ebuild,v 1.6 2005/10/07 05:11:11 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5-r2.ebuild,v 1.7 2005/10/07 10:19:06 eradicator Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -595,7 +595,10 @@ alt_prefix() { alt_libdir() { if is_crosscompile ; then - echo /usr/${CTARGET}/$(get_libdir) + case ${CTARGET} in + mips64*) echo /usr/${CTARGET}/$(get_libdir) ;; + *) echo /usr/${CTARGET}/lib ;; + esac else echo /$(get_libdir) fi @@ -603,7 +606,10 @@ alt_libdir() { alt_usrlibdir() { if is_crosscompile ; then - echo /usr/${CTARGET}/$(get_libdir) + case ${CTARGET} in + mips64*) echo /usr/${CTARGET}/$(get_libdir) ;; + *) echo /usr/${CTARGET}/lib ;; + esac else echo /usr/$(get_libdir) fi diff --git a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild b/sys-libs/glibc/glibc-2.3.5.20050722.ebuild index df233d424c78..a2e32ad8797d 100644 --- a/sys-libs/glibc/glibc-2.3.5.20050722.ebuild +++ b/sys-libs/glibc/glibc-2.3.5.20050722.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-libs/glibc/glibc-2.3.5.20050722.ebuild,v 1.22 2005/10/07 05:11:11 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.5.20050722.ebuild,v 1.23 2005/10/07 10:19:06 eradicator Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -598,7 +598,10 @@ alt_prefix() { alt_libdir() { if is_crosscompile ; then - echo /usr/${CTARGET}/$(get_libdir) + case ${CTARGET} in + mips64*) echo /usr/${CTARGET}/$(get_libdir) ;; + *) echo /usr/${CTARGET}/lib ;; + esac else echo /$(get_libdir) fi @@ -606,7 +609,10 @@ alt_libdir() { alt_usrlibdir() { if is_crosscompile ; then - echo /usr/${CTARGET}/$(get_libdir) + case ${CTARGET} in + mips64*) echo /usr/${CTARGET}/$(get_libdir) ;; + *) echo /usr/${CTARGET}/lib ;; + esac else echo /usr/$(get_libdir) fi |