| 1 |
commit: 909addf96cca3fe5de77e96f47f7d8b9233bac57 |
| 2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 26 15:29:52 2012 +0000 |
| 4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 26 15:29:52 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=909addf9 |
| 7 |
|
| 8 |
auto-multilib.sh: Move multilib behind force-multilib FEATURE |
| 9 |
|
| 10 |
--- |
| 11 |
bin/auto-multilib.sh | 52 ++++++++++++++++++++++++++++--------------------- |
| 12 |
1 files changed, 30 insertions(+), 22 deletions(-) |
| 13 |
|
| 14 |
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh |
| 15 |
index db49c52..d9c68e8 100755 |
| 16 |
--- a/bin/auto-multilib.sh |
| 17 |
+++ b/bin/auto-multilib.sh |
| 18 |
@@ -114,34 +114,42 @@ is_ebuild() { |
| 19 |
} |
| 20 |
|
| 21 |
get_abi_order() { |
| 22 |
- local order= |
| 23 |
- use multilib_abi_"${DEFAULT_ABI}" && order=${DEFAULT_ABI} |
| 24 |
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then |
| 25 |
+ local order= |
| 26 |
+ use multilib_abi_"${DEFAULT_ABI}" && order=${DEFAULT_ABI} |
| 27 |
|
| 28 |
- if is_auto-multilib; then |
| 29 |
- for x in ${MULTILIB_ABIS/${DEFAULT_ABI}} ; do |
| 30 |
- use multilib_abi_"${x}" && order+=" ${x}" |
| 31 |
- done |
| 32 |
- fi |
| 33 |
+ if is_auto-multilib; then |
| 34 |
+ for x in ${MULTILIB_ABIS/${DEFAULT_ABI}} ; do |
| 35 |
+ use multilib_abi_"${x}" && order+=" ${x}" |
| 36 |
+ done |
| 37 |
+ fi |
| 38 |
|
| 39 |
- if [ -z "${order}" ]; then |
| 40 |
- if ! [ -z "${DEFAULT_ABI}" ]; then |
| 41 |
- order=${DEFAULT_ABI} |
| 42 |
- else |
| 43 |
- die "Could not determine your profile ABI(s). Perhaps your USE flags or MULTILIB_ABIS are too restrictive for this package or your profile does not set DEFAULT_ABI." |
| 44 |
+ if [ -z "${order}" ]; then |
| 45 |
+ if ! [ -z "${DEFAULT_ABI}" ]; then |
| 46 |
+ order=${DEFAULT_ABI} |
| 47 |
+ else |
| 48 |
+ die "Could not determine your profile ABI(s). Perhaps your USE flags or MULTILIB_ABIS are too restrictive for this package or your profile does not set DEFAULT_ABI." |
| 49 |
+ fi |
| 50 |
fi |
| 51 |
- fi |
| 52 |
|
| 53 |
- echo ${order} |
| 54 |
+ echo ${order} |
| 55 |
+ else |
| 56 |
+ echo "default" |
| 57 |
+ fi |
| 58 |
} |
| 59 |
|
| 60 |
get_abi_list() { |
| 61 |
- if ! is_ebuild; then |
| 62 |
- for my_abi in $(get_abi_order); do |
| 63 |
- [[ -e "${D%/}".${my_abi} ]] || break |
| 64 |
- done |
| 65 |
- fi |
| 66 |
+ if [[ " ${FEATURES} " == *" force-multilib "* ]]; then |
| 67 |
+ if ! is_ebuild; then |
| 68 |
+ for my_abi in $(get_abi_order); do |
| 69 |
+ [[ -e "${D%/}".${my_abi} ]] || break |
| 70 |
+ done |
| 71 |
+ fi |
| 72 |
|
| 73 |
- is_ebuild && echo $(get_abi_order) || echo ${my_abi} |
| 74 |
+ is_ebuild && echo $(get_abi_order) || echo ${my_abi} |
| 75 |
+ else |
| 76 |
+ echo "default" |
| 77 |
+ fi |
| 78 |
} |
| 79 |
|
| 80 |
set_abi() { |
| 81 |
@@ -215,9 +223,9 @@ unset_abi() { |
| 82 |
} |
| 83 |
|
| 84 |
_get_abi_string() { |
| 85 |
- if is_auto-multilib && [ -n "${ABI}" ]; then |
| 86 |
+ [[ " ${FEATURES} " == *" force-multilib "* ]] && \ |
| 87 |
+ is_auto-multilib && [ -n "${ABI}" ] && \ |
| 88 |
echo " (for ABI=${ABI})" |
| 89 |
- fi |
| 90 |
} |
| 91 |
|
| 92 |
_setup_abi_env() { |
Archives