diff options
| author |   Jeremy Huddleston <eradicator@gentoo.org> | 2005-03-10 23:45:56 +0000 |
|---|---|---|
| committer | Jeremy Huddleston <eradicator@gentoo.org> | 2005-03-10 23:45:56 +0000 |
| commit | e9b45a28bd699f34ac5a0ab3e46953786861da4a (patch) | |
| tree | a328b50c8e7fa6570c447182113cef451ec4a7b3 /sys-apps/baselayout | |
| parent | Tiny cleanup in symlink creation of the .so. (diff) | |
| download | gentoo-2-e9b45a28bd699f34ac5a0ab3e46953786861da4a.tar.gz gentoo-2-e9b45a28bd699f34ac5a0ab3e46953786861da4a.tar.bz2 gentoo-2-e9b45a28bd699f34ac5a0ab3e46953786861da4a.zip | |
Fix logic to create /etc/env.d/04multilib on amd64/2004.3. This closes bug #82911.
(Portage version: 2.0.51.19)
Diffstat (limited to 'sys-apps/baselayout')
| -rw-r--r-- | sys-apps/baselayout/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-1.11.10.ebuild | 4 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-1.11.9-r1.ebuild | 4 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-1.12.0_alpha1.ebuild | 4 |
4 files changed, 13 insertions, 7 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index 939a34535393..5b739c676acf 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,10 +1,16 @@ # ChangeLog for sys-apps/baselayout # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.214 2005/03/10 16:48:28 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.215 2005/03/10 23:45:56 eradicator Exp $ # See the gentoo-src rc-scripts ChangeLog for up-to-date release information: # http://www.gentoo.org/cgi-bin/viewcvs.cgi/rc-scripts/ChangeLog?rev=HEAD&cvsroot=gentoo-src&content-type=text/vnd.viewcvs-markup + 10 Mar 2005; Jeremy Huddleston <eradicator@gentoo.org> + baselayout-1.11.10.ebuild, baselayout-1.11.9-r1.ebuild, + baselayout-1.12.0_alpha1.ebuild: + Fix logic to create /etc/env.d/04multilib on amd64/2004.3. This closes bug + #82911. + *baselayout-1.12.0_alpha1 (10 Mar 2005) 10 Mar 2005; Aron Griffis <agriffis@gentoo.org> baselayout-1.11.10.ebuild, diff --git a/sys-apps/baselayout/baselayout-1.11.10.ebuild b/sys-apps/baselayout/baselayout-1.11.10.ebuild index 7c530d71f059..2f7c54a4bcb7 100644 --- a/sys-apps/baselayout/baselayout-1.11.10.ebuild +++ b/sys-apps/baselayout/baselayout-1.11.10.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-apps/baselayout/baselayout-1.11.10.ebuild,v 1.2 2005/03/10 16:48:28 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.10.ebuild,v 1.3 2005/03/10 23:45:56 eradicator Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -255,7 +255,7 @@ src_install() { # List all the multilib libdirs in /etc/env/04multilib (only if they're # actually different from the normal - if [ $(number_abis) -ne 1 -o $(get_libdir) != "lib" ]; then + if has_multilib_profile || [[ $(get_libdir) != "lib" || -n ${CONF_MULTILIBDIR} ]]; then echo "LDPATH=\"${libdirs_env}\"" > ${D}/etc/env.d/04multilib fi diff --git a/sys-apps/baselayout/baselayout-1.11.9-r1.ebuild b/sys-apps/baselayout/baselayout-1.11.9-r1.ebuild index f9fabfe9fec7..482a4029e374 100644 --- a/sys-apps/baselayout/baselayout-1.11.9-r1.ebuild +++ b/sys-apps/baselayout/baselayout-1.11.9-r1.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-apps/baselayout/baselayout-1.11.9-r1.ebuild,v 1.6 2005/03/01 22:01:23 solar Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.11.9-r1.ebuild,v 1.7 2005/03/10 23:45:56 eradicator Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -259,7 +259,7 @@ src_install() { # List all the multilib libdirs in /etc/env/04multilib (only if they're # actually different from the normal - if [ $(number_abis) -ne 1 -o $(get_libdir) != "lib" ]; then + if has_multilib_profile || [[ $(get_libdir) != "lib" || -n ${CONF_MULTILIBDIR} ]]; then echo "LDPATH=\"${libdirs_env}\"" > ${D}/etc/env.d/04multilib fi diff --git a/sys-apps/baselayout/baselayout-1.12.0_alpha1.ebuild b/sys-apps/baselayout/baselayout-1.12.0_alpha1.ebuild index 4340c960039a..115beb44ad8d 100644 --- a/sys-apps/baselayout/baselayout-1.12.0_alpha1.ebuild +++ b/sys-apps/baselayout/baselayout-1.12.0_alpha1.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-apps/baselayout/baselayout-1.12.0_alpha1.ebuild,v 1.1 2005/03/10 16:48:28 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-1.12.0_alpha1.ebuild,v 1.2 2005/03/10 23:45:56 eradicator Exp $ inherit flag-o-matic eutils toolchain-funcs multilib @@ -255,7 +255,7 @@ src_install() { # List all the multilib libdirs in /etc/env/04multilib (only if they're # actually different from the normal - if [ $(number_abis) -ne 1 -o $(get_libdir) != "lib" ]; then + if has_multilib_profile || [[ $(get_libdir) != "lib" || -n ${CONF_MULTILIBDIR} ]]; then echo "LDPATH=\"${libdirs_env}\"" > ${D}/etc/env.d/04multilib fi |