aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürgen Buchmüller <pullmoll@t-online.de>2019-05-28 13:11:37 +0000
committerJürgen Buchmüller <pullmoll@t-online.de>2019-05-28 13:14:23 +0000
commit998aac300abce57662e745f94632ac2177a88c82 (patch)
treeefc4bc888f7ce2e4b32c1576837ebfc760f8b5c1
parent9f8a8555b2ae8d0367f4742fc2ce2a9ab5023d10 (diff)
downloadvoid-packages-998aac300abce57662e745f94632ac2177a88c82.tar
void-packages-998aac300abce57662e745f94632ac2177a88c82.tar.gz
void-packages-998aac300abce57662e745f94632ac2177a88c82.tar.bz2
void-packages-998aac300abce57662e745f94632ac2177a88c82.tar.lz
void-packages-998aac300abce57662e745f94632ac2177a88c82.tar.xz
void-packages-998aac300abce57662e745f94632ac2177a88c82.tar.zst
void-packages-998aac300abce57662e745f94632ac2177a88c82.zip
hooks/pre-pkg/05-prepare-32bit.sh: fix symlinks
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 <pullmoll@t-online.de>
-rw-r--r--common/hooks/pre-pkg/05-prepare-32bit.sh6
1 files changed, 5 insertions, 1 deletions
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.