commit: 2e1579a9b91f1d03e116d03ceec25614275a75b1
Author: Thomas Sachau <tommy <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 1 09:19:08 2018 +0000
Commit: Thomas Sachau <tommy <AT> gentoo <DOT> org>
CommitDate: Sat Sep 1 09:19:08 2018 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=2e1579a9
Fix detection for multilib builds
bin/auto-multilib.sh | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh
index eabef5daf..010ec1cd6 100755
--- a/bin/auto-multilib.sh
+++ b/bin/auto-multilib.sh
@@ -275,25 +275,25 @@ _finalize_abi_install() {
# Create wrapper symlink for *-config files
local i=
- 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)
+ 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)
local noabi=()
for i in ${MULTILIB_ABIS}; do
noabi+=( ! -name '*-'${i} )
done
if use abiwrapper ; then
- for i in $(find "${D}"usr/bin/ "${D}"usr/sbin "${D}"bin
"${D}"sbin -type f ${noabi[@]} 2>/dev/null); do
+ for i in $(find "${D}"/usr/bin/ "${D}"/usr/sbin "${D}"/bin
"${D}"/sbin -type f ${noabi[@]} 2>/dev/null); do
prep_ml_binaries "${i}"
done
fi
local LIBDIR=$(portage-get_abi_var LIBDIR $1)
#FIXME: better way then hardcoding llvm to work around
/usr/lib/llvm/${LIBDIR}
- if ( [[ -d "${D}${LIBDIR}" ]] || [[ -d "${D}usr/${LIBDIR}" ]] || [[ -d
"${base}" ]] || \
- (shopt -s nullglob dotglob; f=("${D}"usr/bin/*-config);
((${#f[@]}))) || \
- (shopt -s nullglob dotglob;
f=("${D}"usr/lib/llvm/*/bin/*-config); ((${#f[@]}))) || \
+ if ( [[ -d "${D}/${LIBDIR}" ]] || [[ -d "${D}/usr/${LIBDIR}" ]] || [[
-d "${base}" ]] || \
+ (shopt -s nullglob dotglob; f=("${D}"/usr/bin/*-config);
((${#f[@]}))) || \
+ (shopt -s nullglob dotglob;
f=("${D}"/usr/lib/llvm/*/bin/*-config); ((${#f[@]}))) || \
( use abiwrapper && \
- ( [[ -d "${D}"usr/bin ]] || \
- [[ -d "${D}"usr/sbin ]] || [[ -d "${D}"bin ]]
|| [[ -d "${D}"sbin ]])) ); then
+ ( [[ -d "${D}"/usr/bin ]] || \
+ [[ -d "${D}"/usr/sbin ]] || [[ -d "${D}"/bin ]]
|| [[ -d "${D}"/sbin ]])) ); then
mv "${D}" "${D%/}".${ABI} || die
for my_abi in ${ALL_ABIS}; do
