| 1 |
commit: 5ac6071c931acd281eddd9bae478386df7a1bfc3 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 3 10:45:25 2016 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 3 11:05:59 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ac6071c |
| 7 |
|
| 8 |
sys-apps/baselayout: Do not complain about lib+lib32 when it is valid |
| 9 |
|
| 10 |
Remove the error on 'lib' directory with SYMLINK_LIB=no multilib layout |
| 11 |
if lib32 is a valid directory as well. This fixes the wrong assert |
| 12 |
in the new no-lib-symlink profile while preserving the check on regular |
| 13 |
lib+lib64 profile. |
| 14 |
|
| 15 |
sys-apps/baselayout/baselayout-2.3.ebuild | 2 +- |
| 16 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/sys-apps/baselayout/baselayout-2.3.ebuild b/sys-apps/baselayout/baselayout-2.3.ebuild |
| 19 |
index b4e82d2..d3d1351 100644 |
| 20 |
--- a/sys-apps/baselayout/baselayout-2.3.ebuild |
| 21 |
+++ b/sys-apps/baselayout/baselayout-2.3.ebuild |
| 22 |
@@ -87,7 +87,7 @@ multilib_layout() { |
| 23 |
else |
| 24 |
mkdir -p "${prefix}lib" || die |
| 25 |
fi |
| 26 |
- elif [ -d "${prefix}lib" ] ; then |
| 27 |
+ elif [ -d "${prefix}lib" ] && ! has lib32 ${libdirs} ; then |
| 28 |
# make sure the old "lib" ABI location does not exist; we |
| 29 |
# only symlinked the lib dir on systems where we moved it |
| 30 |
# to "lib32" ... |
Archives