| 1 |
commit: 0e071b3d533ce1bba96e0371931b1426e6d9993f |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 10 17:42:44 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 10 21:41:21 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e071b3d |
| 7 |
|
| 8 |
sys-apps/baselayout: Fix handling transitional lib32 symlink |
| 9 |
|
| 10 |
sys-apps/baselayout/baselayout-2.4.1-r2.ebuild | 2 +- |
| 11 |
sys-apps/baselayout/baselayout-9999.ebuild | 2 +- |
| 12 |
2 files changed, 2 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild |
| 15 |
index d137c15e527..bc82d2ddcdb 100644 |
| 16 |
--- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild |
| 17 |
+++ b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild |
| 18 |
@@ -93,7 +93,7 @@ multilib_layout() { |
| 19 |
case ${CHOST} in |
| 20 |
*-gentoo-freebsd*) ;; # We want it the other way on fbsd. |
| 21 |
i?86*|x86_64*|powerpc*|sparc*|s390*) |
| 22 |
- if [ -d "${prefix}lib32" ] ; then |
| 23 |
+ if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then |
| 24 |
rm -f "${prefix}lib32"/.keep |
| 25 |
if ! rmdir "${prefix}lib32" 2>/dev/null ; then |
| 26 |
ewarn "You need to merge ${prefix}lib32 into ${prefix}lib" |
| 27 |
|
| 28 |
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild |
| 29 |
index 7e43ea7af59..a7d95e53ed4 100644 |
| 30 |
--- a/sys-apps/baselayout/baselayout-9999.ebuild |
| 31 |
+++ b/sys-apps/baselayout/baselayout-9999.ebuild |
| 32 |
@@ -111,7 +111,7 @@ multilib_layout() { |
| 33 |
case ${CHOST} in |
| 34 |
*-gentoo-freebsd*) ;; # We want it the other way on fbsd. |
| 35 |
i?86*|x86_64*|powerpc*|sparc*|s390*) |
| 36 |
- if [ -d "${prefix}lib32" ] ; then |
| 37 |
+ if [[ -d ${prefix}lib32 && ! -h ${prefix}lib32 ]] ; then |
| 38 |
rm -f "${prefix}lib32"/.keep |
| 39 |
if ! rmdir "${prefix}lib32" 2>/dev/null ; then |
| 40 |
ewarn "You need to merge ${prefix}lib32 into ${prefix}lib" |
Archives