1 |
commit: 990780b52e169ed8e5b6b3f48624321ccb84352d |
2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 30 14:03:06 2012 +0000 |
4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 30 14:03:06 2012 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=990780b5 |
7 |
|
8 |
Move configuration of binary wrapping from variable to USE flag (called abiwrapper) |
9 |
|
10 |
--- |
11 |
bin/auto-multilib.sh | 2 +- |
12 |
pym/_emerge/Package.py | 1 + |
13 |
2 files changed, 2 insertions(+), 1 deletions(-) |
14 |
|
15 |
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh |
16 |
index 7abed9b..4287f0f 100755 |
17 |
--- a/bin/auto-multilib.sh |
18 |
+++ b/bin/auto-multilib.sh |
19 |
@@ -302,7 +302,7 @@ _finalize_abi_install() { |
20 |
for i in ${MULTILIB_ABIS}; do |
21 |
noabi+=( ! -name '*-'${i} ) |
22 |
done |
23 |
- if ! [[ ${RESTRICT_MULTILIB_BINARIES} == *${CATEGORY}/${PN}* ]]; then |
24 |
+ if use abiwrapper ; then |
25 |
for i in $(find "${D}"usr/bin/ "${D}"usr/sbin "${D}"bin "${D}"sbin -type f ${noabi[@]} 2>/dev/null); do |
26 |
prep_ml_binaries "${i}" |
27 |
done |
28 |
|
29 |
diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py |
30 |
index a587185..0a09fa5 100644 |
31 |
--- a/pym/_emerge/Package.py |
32 |
+++ b/pym/_emerge/Package.py |
33 |
@@ -641,6 +641,7 @@ class _PackageMetadataWrapper(_PackageMetadataWrapperBase): |
34 |
if 'force-multilib' in self._pkg.root_config.settings.get("FEATURES", ''): |
35 |
for multilib_abis in self._pkg.root_config.settings.get("MULTILIB_ABIS", '').split(' '): |
36 |
v = v + " multilib_abi_" + multilib_abis |
37 |
+ v = v + " abiwrapper" |
38 |
self._pkg.iuse = self._pkg._iuse( |
39 |
v.split(), self._pkg.root_config.settings._iuse_implicit_match) |