From 998aac300abce57662e745f94632ac2177a88c82 Mon Sep 17 00:00:00 2001 From: Jürgen Buchmüller Date: Tue, 28 May 2019 15:11:37 +0200 Subject: hooks/pre-pkg/05-prepare-32bit.sh: fix symlinks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If lib32symlinks contains plain library names without a path as in the case of glibc (lib32symlinks="ld-linux.so.2") the expression ${f%/*} is not empty, but returns the basename. Handle that case by verifying that ${f%/*} is different from ${f}. Signed-off-by: Jürgen Buchmüller --- common/hooks/pre-pkg/05-prepare-32bit.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/hooks/pre-pkg/05-prepare-32bit.sh b/common/hooks/pre-pkg/05-prepare-32bit.sh index 2056d7fa9e8..fd6fdf88217 100644 --- a/common/hooks/pre-pkg/05-prepare-32bit.sh +++ b/common/hooks/pre-pkg/05-prepare-32bit.sh @@ -156,7 +156,11 @@ hook() { # Additional symlinks to the native libdir. for f in ${lib32symlinks}; do echo "$pkgver: symlinking $f to the native libdir..." - mkdir -p ${destdir32}/usr/lib{,32}/${f%/*}/ + if [ "${f%/*}" != "${f}" ]; then + mkdir -p ${destdir32}/usr/lib{,32}/${f%/*}/ + else + mkdir -p ${destdir32}/usr/lib{,32}/ + fi ln -sfr ${destdir32}/usr/lib32/$f ${destdir32}/usr/lib/$f done # If it's a development pkg add a dependency to the 64bit pkg. -- cgit v1.2.3