diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2012-10-13 19:18:18 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2012-10-13 19:18:18 +0000 |
| commit | 161651a770c1f5711f20c0ded904622167873f9b (patch) | |
| tree | 3cae20038fd560ea54fa0f29c7d5076c10fe4f4b /sys-apps/baselayout | |
| parent | ia64/s390/sh/sparc stable wrt #427546 (diff) | |
| download | gentoo-2-161651a770c1f5711f20c0ded904622167873f9b.tar.gz gentoo-2-161651a770c1f5711f20c0ded904622167873f9b.tar.bz2 gentoo-2-161651a770c1f5711f20c0ded904622167873f9b.zip | |
Do not die for "non-standard" mutlilib setups on FreeBSD since that is what we want. bug #436560
(Portage version: 2.2.0_alpha137/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps/baselayout')
| -rw-r--r-- | sys-apps/baselayout/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/baselayout/baselayout-2.2.ebuild | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sys-apps/baselayout/ChangeLog b/sys-apps/baselayout/ChangeLog index dedc3802266e..8b8966e1088c 100644 --- a/sys-apps/baselayout/ChangeLog +++ b/sys-apps/baselayout/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/baselayout # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.529 2012/08/23 21:47:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/ChangeLog,v 1.530 2012/10/13 19:18:18 aballier Exp $ + + 13 Oct 2012; Alexis Ballier <aballier@gentoo.org> baselayout-2.2.ebuild: + Do not die for "non-standard" mutlilib setups on FreeBSD since that is what + we want. bug #436560 23 Aug 2012; Mike Frysinger <vapier@gentoo.org> baselayout-2.1-r1.ebuild, baselayout-2.2.ebuild: diff --git a/sys-apps/baselayout/baselayout-2.2.ebuild b/sys-apps/baselayout/baselayout-2.2.ebuild index 2e925134a603..5127292e963c 100644 --- a/sys-apps/baselayout/baselayout-2.2.ebuild +++ b/sys-apps/baselayout/baselayout-2.2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.2.ebuild,v 1.2 2012/08/23 21:47:35 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout/baselayout-2.2.ebuild,v 1.3 2012/10/13 19:18:18 aballier Exp $ inherit eutils multilib @@ -104,6 +104,7 @@ multilib_layout() { # only symlinked the lib dir on systems where we moved it # to "lib32" ... case ${CHOST} in + *-gentoo-freebsd*) ;; # We want it the other way on fbsd. i?86*|x86_64*|powerpc*|sparc*|s390*) if [ -d "${prefix}lib32" ] ; then rm -f "${prefix}lib32"/.keep |