summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2017-12-10 18:42:44 +0100
committerMichał Górny <mgorny@gentoo.org>2017-12-10 22:41:21 +0100
commit0e071b3d533ce1bba96e0371931b1426e6d9993f (patch)
tree25da5d2b32e5c5f500dd31a34888ee088c6d5f6d /sys-apps/baselayout
parentgames-rpg/vendetta-online-bin: Update Manifest hashes (diff)
downloadgentoo-0e071b3d533ce1bba96e0371931b1426e6d9993f.tar.gz
gentoo-0e071b3d533ce1bba96e0371931b1426e6d9993f.tar.bz2
gentoo-0e071b3d533ce1bba96e0371931b1426e6d9993f.zip
sys-apps/baselayout: Fix handling transitional lib32 symlink
Diffstat (limited to 'sys-apps/baselayout')
-rw-r--r--sys-apps/baselayout/baselayout-2.4.1-r2.ebuild2
-rw-r--r--sys-apps/baselayout/baselayout-9999.ebuild2
2 files changed, 2 insertions, 2 deletions
diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
index d137c15e527..bc82d2ddcdb 100644
--- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
@@ -93,7 +93,7 @@ multilib_layout() {
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
+ if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
rm -f "${prefix}lib32"/.keep
if ! rmdir "${prefix}lib32" 2>/dev/null ; then
ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index 7e43ea7af59..a7d95e53ed4 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -111,7 +111,7 @@ multilib_layout() {
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
+ if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then
rm -f "${prefix}lib32"/.keep
if ! rmdir "${prefix}lib32" 2>/dev/null ; then
ewarn "You need to merge ${prefix}lib32 into ${prefix}lib"