void/void-packages
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hooks/post-install/06-prepare-32bit.sh: return early if destdir32 does not exist; only for x86.

Browse source
This commit is contained in:
Juan RP 2014-03-07 09:49:41 +01:00
parent d1b0883768
commit 772e938938
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/hooks/post-install/06-prepare-32bit.sh
View file

@ -12,7 +12,7 @@ hook() {
return return
fi fi
# This hook will only work when building for x86. # This hook will only work when building for x86.
if [ "$XBPS_MACHINE" != "i686" ]; then if [ "$XBPS_TARGET_MACHINE" != "i686" ]; then
return return
fi fi
# Ignore noarch pkgs. # Ignore noarch pkgs.
@ -43,6 +43,10 @@ hook() {
rmdir --ignore-fail-on-non-empty -p "$f" &>/dev/null rmdir --ignore-fail-on-non-empty -p "$f" &>/dev/null
done done
if [ ! -d ${destdir32} ]; then
return
fi
# Switch pkg-config files to lib32. # Switch pkg-config files to lib32.
if [ -d ${destdir32}/usr/lib32/pkgconfig ]; then if [ -d ${destdir32}/usr/lib32/pkgconfig ]; then
sed -e 's,/usr/lib,/usr/lib32,g' \ sed -e 's,/usr/lib,/usr/lib32,g' \