1 |
commit: 2e1579a9b91f1d03e116d03ceec25614275a75b1 |
2 |
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 1 09:19:08 2018 +0000 |
4 |
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 1 09:19:08 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2e1579a9 |
7 |
|
8 |
Fix detection for multilib builds |
9 |
|
10 |
bin/auto-multilib.sh | 14 +++++++------- |
11 |
1 file changed, 7 insertions(+), 7 deletions(-) |
12 |
|
13 |
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh |
14 |
index eabef5daf..010ec1cd6 100755 |
15 |
--- a/bin/auto-multilib.sh |
16 |
+++ b/bin/auto-multilib.sh |
17 |
@@ -275,25 +275,25 @@ _finalize_abi_install() { |
18 |
|
19 |
# Create wrapper symlink for *-config files |
20 |
local i= |
21 |
- prep_ml_binaries $(find "${D}"usr/bin "${D}"usr/sbin "${D}"bin "${D}"sbin "${D}"usr/lib/llvm/*/bin -type f -name '*-config' 2>/dev/null) |
22 |
+ prep_ml_binaries $(find "${D}"/usr/bin "${D}"/usr/sbin "${D}"/bin "${D}"/sbin "${D}"/usr/lib/llvm/*/bin -type f -name '*-config' 2>/dev/null) |
23 |
|
24 |
local noabi=() |
25 |
for i in ${MULTILIB_ABIS}; do |
26 |
noabi+=( ! -name '*-'${i} ) |
27 |
done |
28 |
if use abiwrapper ; then |
29 |
- for i in $(find "${D}"usr/bin/ "${D}"usr/sbin "${D}"bin "${D}"sbin -type f ${noabi[@]} 2>/dev/null); do |
30 |
+ for i in $(find "${D}"/usr/bin/ "${D}"/usr/sbin "${D}"/bin "${D}"/sbin -type f ${noabi[@]} 2>/dev/null); do |
31 |
prep_ml_binaries "${i}" |
32 |
done |
33 |
fi |
34 |
local LIBDIR=$(portage-get_abi_var LIBDIR $1) |
35 |
#FIXME: better way then hardcoding llvm to work around /usr/lib/llvm/${LIBDIR} |
36 |
- if ( [[ -d "${D}${LIBDIR}" ]] || [[ -d "${D}usr/${LIBDIR}" ]] || [[ -d "${base}" ]] || \ |
37 |
- (shopt -s nullglob dotglob; f=("${D}"usr/bin/*-config); ((${#f[@]}))) || \ |
38 |
- (shopt -s nullglob dotglob; f=("${D}"usr/lib/llvm/*/bin/*-config); ((${#f[@]}))) || \ |
39 |
+ if ( [[ -d "${D}/${LIBDIR}" ]] || [[ -d "${D}/usr/${LIBDIR}" ]] || [[ -d "${base}" ]] || \ |
40 |
+ (shopt -s nullglob dotglob; f=("${D}"/usr/bin/*-config); ((${#f[@]}))) || \ |
41 |
+ (shopt -s nullglob dotglob; f=("${D}"/usr/lib/llvm/*/bin/*-config); ((${#f[@]}))) || \ |
42 |
( use abiwrapper && \ |
43 |
- ( [[ -d "${D}"usr/bin ]] || \ |
44 |
- [[ -d "${D}"usr/sbin ]] || [[ -d "${D}"bin ]] || [[ -d "${D}"sbin ]])) ); then |
45 |
+ ( [[ -d "${D}"/usr/bin ]] || \ |
46 |
+ [[ -d "${D}"/usr/sbin ]] || [[ -d "${D}"/bin ]] || [[ -d "${D}"/sbin ]])) ); then |
47 |
|
48 |
mv "${D}" "${D%/}".${ABI} || die |
49 |
for my_abi in ${ALL_ABIS}; do |