diff options
| author |   Travis Tilley <lv@gentoo.org> | 2004-09-27 19:26:10 +0000 |
|---|---|---|
| committer | Travis Tilley <lv@gentoo.org> | 2004-09-27 19:26:10 +0000 |
| commit | e4bc41e0bb3ce4d72521cef6dff117ed0e2c62e6 (patch) | |
| tree | 133ecd6bb8e0aedfa3ae255ba965ea3898cf59bb /sys-apps | |
| parent | Stable on sparc wrt #64223 (diff) | |
| download | historical-e4bc41e0bb3ce4d72521cef6dff117ed0e2c62e6.tar.gz historical-e4bc41e0bb3ce4d72521cef6dff117ed0e2c62e6.tar.bz2 historical-e4bc41e0bb3ce4d72521cef6dff117ed0e2c62e6.zip | |
fix multilib sandbox to build whenever support is available, regardless of USE settings.
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/Manifest | 16 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.0.50-r11.ebuild | 9 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.0.51_rc6.ebuild | 9 |
3 files changed, 11 insertions, 23 deletions
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest index 2578a25f8f99..a9f6b8942c47 100644 --- a/sys-apps/portage/Manifest +++ b/sys-apps/portage/Manifest @@ -1,17 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 c29de4f5d7426a6a5cf84e3e8548a154 portage-2.0.51_rc6.ebuild 11910 -MD5 9dbe7a29709295fbaa92f080bd227da2 portage-2.0.50-r11.ebuild 11694 MD5 ba4ae80e5e6cf58aac9c5aa1cc5f777e ChangeLog 411 MD5 4ec0f0ae9676b9d2d227d737d508306b metadata.xml 165 +MD5 e1e2fe6098da06378ce8820eeacaf7ff portage-2.0.51_rc6.ebuild 11793 +MD5 b72e7a2808265094e34eada672e50240 portage-2.0.50-r11.ebuild 11577 +MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911 MD5 5375f0805d4d56dc961ad81162854790 files/digest-portage-2.0.50-r11 71 MD5 0280081c01fecc4602a8cccf02abff6a files/digest-portage-2.0.51_rc6 71 -MD5 a754ca9e2eea9f8484bf5f93d339043a files/README.RESCUE 1911 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.2.6 (GNU/Linux) - -iD8DBQFBV9IcBDOEqLMd+jQRAj3pAJ9/de/cy1po0RFNbRHW4GqFh5y9IwCdHF+p -cGuOGwxOUVJfGBOvnw/mH8E= -=mGFA ------END PGP SIGNATURE----- diff --git a/sys-apps/portage/portage-2.0.50-r11.ebuild b/sys-apps/portage/portage-2.0.50-r11.ebuild index 3e5c500a676d..f702446579d4 100644 --- a/sys-apps/portage/portage-2.0.50-r11.ebuild +++ b/sys-apps/portage/portage-2.0.50-r11.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.50-r11.ebuild,v 1.4 2004/09/27 08:40:41 carpaski Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.50-r11.ebuild,v 1.5 2004/09/27 19:26:10 lv Exp $ -IUSE="build multilib selinux" +IUSE="build selinux" +inherit eutils flag-o-matic # If the old /lib/sandbox.so is in /etc/ld.so.preload, it can # cause everything to segfault !! @@ -32,9 +33,7 @@ python_version() { } check_multilib() { - use !multilib && return - echo "main() {}" > ./check-multilib.c - /usr/bin/gcc -m32 -o ./check-multilib ./check-multilib.c > /dev/null 2>&1 + has_m32 if [ "$?" == 0 ]; then einfo "Found valid multilib environment." einfo "Building with multilib support." diff --git a/sys-apps/portage/portage-2.0.51_rc6.ebuild b/sys-apps/portage/portage-2.0.51_rc6.ebuild index 899c98e3417b..04b45ee111f0 100644 --- a/sys-apps/portage/portage-2.0.51_rc6.ebuild +++ b/sys-apps/portage/portage-2.0.51_rc6.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2004 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51_rc6.ebuild,v 1.2 2004/09/27 08:40:41 carpaski Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.0.51_rc6.ebuild,v 1.3 2004/09/27 19:26:10 lv Exp $ -IUSE="build multilib selinux" +IUSE="build selinux" +inherit eutils flag-o-matic # If the old /lib/sandbox.so is in /etc/ld.so.preload, it can # cause everything to segfault !! @@ -33,9 +34,7 @@ python_version() { } check_multilib() { - use !multilib && return - echo 'main() {}' > ./check-multilib.c - /usr/bin/gcc -m32 -o ./check-multilib ./check-multilib.c > /dev/null 2>&1 + has_m32 if [ "$?" == 0 ]; then einfo "Found valid multilib environment." einfo "Building with multilib support." |