| 1 |
commit: 968d828e41322f5ffa55500ad253231cd534bd0b |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Dec 11 22:40:56 2015 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Dec 11 22:42:33 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=968d828e |
| 7 |
|
| 8 |
multilib-build.eclass: Use split assignment/readonly calls |
| 9 |
|
| 10 |
Use split assignments and readonly calls rather than combined form since |
| 11 |
the latter works unreliably for reason unknown. |
| 12 |
|
| 13 |
eclass/multilib-build.eclass | 6 ++++-- |
| 14 |
1 file changed, 4 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/eclass/multilib-build.eclass b/eclass/multilib-build.eclass |
| 17 |
index 91885a4..deb03db 100644 |
| 18 |
--- a/eclass/multilib-build.eclass |
| 19 |
+++ b/eclass/multilib-build.eclass |
| 20 |
@@ -38,7 +38,7 @@ inherit multibuild multilib |
| 21 |
# Please contact multilib before modifying this list. This way we can |
| 22 |
# ensure that every *preliminary* work is done and the multilib can be |
| 23 |
# extended safely. |
| 24 |
-readonly _MULTILIB_FLAGS=( |
| 25 |
+_MULTILIB_FLAGS=( |
| 26 |
abi_x86_32:x86,x86_fbsd,x86_freebsd,x86_linux,x86_macos,x86_solaris |
| 27 |
abi_x86_64:amd64,amd64_fbsd,x64_freebsd,amd64_linux,x64_macos,x64_solaris |
| 28 |
abi_x86_x32:x32 |
| 29 |
@@ -50,6 +50,7 @@ readonly _MULTILIB_FLAGS=( |
| 30 |
abi_s390_32:s390 |
| 31 |
abi_s390_64:s390x |
| 32 |
) |
| 33 |
+readonly _MULTILIB_FLAGS |
| 34 |
|
| 35 |
# @ECLASS-VARIABLE: MULTILIB_COMPAT |
| 36 |
# @DEFAULT_UNSET |
| 37 |
@@ -124,7 +125,8 @@ _multilib_build_set_globals() { |
| 38 |
local usedeps=${flags[@]/%/(-)?} |
| 39 |
|
| 40 |
IUSE=${flags[*]} |
| 41 |
- readonly MULTILIB_USEDEP=${usedeps// /,} |
| 42 |
+ MULTILIB_USEDEP=${usedeps// /,} |
| 43 |
+ readonly MULTILIB_USEDEP |
| 44 |
} |
| 45 |
_multilib_build_set_globals |
| 46 |
unset -f _multilib_build_set_globals |
Archives