diff options
| author |   Danny van Dyk <kugelfang@gentoo.org> | 2006-08-05 01:05:13 +0000 |
|---|---|---|
| committer | Danny van Dyk <kugelfang@gentoo.org> | 2006-08-05 01:05:13 +0000 |
| commit | 6a6e78777d0c8509dc8a8b09b4b6bccc77af9094 (patch) | |
| tree | 9302fdc397bf6d113d48f05f5d5efd946753bb96 | |
| parent | Adding perl dep; fixed DEPEND (diff) | |
| download | gentoo-2-6a6e78777d0c8509dc8a8b09b4b6bccc77af9094.tar.gz gentoo-2-6a6e78777d0c8509dc8a8b09b4b6bccc77af9094.tar.bz2 gentoo-2-6a6e78777d0c8509dc8a8b09b4b6bccc77af9094.zip | |
Fixed bug #142832: wrapped crosscompile-fix in 'if is_crosscompile && ...'.
(Portage version: 2.1.1_pre3-r1)
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.6-r4.ebuild | 4 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.4-r3.ebuild | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index eb5bd3923984..2ab752d79ad9 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-libs/glibc # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.475 2006/07/28 14:52:33 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.476 2006/08/05 01:05:13 kugelfang Exp $ + + 05 Aug 2006; Danny van Dyk <kugelfang@gentoo.org> glibc-2.3.6-r4.ebuild, + glibc-2.4-r3.ebuild: + Fixed bug #142832: wrapped crosscompile-fix in 'if is_crosscompile && ...'. 28 Jul 2006; <plasmaroo@gentoo.org> glibc-2.3.5-r3.ebuild: Stable on IA64; fix bug #141681. diff --git a/sys-libs/glibc/glibc-2.3.6-r4.ebuild b/sys-libs/glibc/glibc-2.3.6-r4.ebuild index 9d267d4dcdda..0f940b454bb7 100644 --- a/sys-libs/glibc/glibc-2.3.6-r4.ebuild +++ b/sys-libs/glibc/glibc-2.3.6-r4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r4.ebuild,v 1.26 2006/07/22 15:45:59 kloeri Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.6-r4.ebuild,v 1.27 2006/08/05 01:05:13 kugelfang Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -381,7 +381,7 @@ toolchain-glibc_src_install() { # When cross-compiling for a non-multilib setup, make sure we have # lib and a proper symlink setup - if ! use multilib && ! has_multilib_profile && [[ $(get_libdir) != "lib" ]] ; then + if is_crosscompile && ! use multilib && ! has_multilib_profile && [[ $(get_libdir) != "lib" ]] ; then cd "${D}"$(alt_libdir)/.. mv $(get_libdir) lib || die ln -s lib $(get_libdir) || die diff --git a/sys-libs/glibc/glibc-2.4-r3.ebuild b/sys-libs/glibc/glibc-2.4-r3.ebuild index 9bf6ec362709..1bf5a25cee6f 100644 --- a/sys-libs/glibc/glibc-2.4-r3.ebuild +++ b/sys-libs/glibc/glibc-2.4-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r3.ebuild,v 1.15 2006/07/17 22:43:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.4-r3.ebuild,v 1.16 2006/08/05 01:05:13 kugelfang Exp $ # Here's how the cross-compile logic breaks down ... # CTARGET - machine that will target the binaries @@ -410,7 +410,7 @@ toolchain-glibc_src_install() { # When cross-compiling for a non-multilib setup, make sure we have # lib and a proper symlink setup - if ! use multilib && ! has_multilib_profile && [[ $(get_libdir) != "lib" ]] ; then + if is_crosscompile && ! use multilib && ! has_multilib_profile && [[ $(get_libdir) != "lib" ]] ; then cd "${D}"$(alt_libdir)/.. mv $(get_libdir) lib || die ln -s lib $(get_libdir) || die |