moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: fix hooks that are expected to be used in subpkgs.

Browse source
This commit is contained in:
Juan RP 2015-01-14 14:22:18 +01:00
parent 5a7ae5989e
commit aed0f3ee0e
3 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/hooks/post-install/98-lib32.sh
View file

@ -2,6 +2,6 @@
hook() { hook() {
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
rm -f ${DESTDIR}/usr/lib32 rm -f ${PKGDESTDIR}/usr/lib32
fi fi
} }

2
common/hooks/pre-install/00-lib32.sh
View file

@ -3,6 +3,6 @@
hook() { hook() {
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
vmkdir usr/lib vmkdir usr/lib
ln -sf lib ${DESTDIR}/usr/lib32 ln -sf lib ${PKGDESTDIR}/usr/lib32
fi fi
} }

2
common/xbps-src/libexec/xbps-src-doinstall.sh
View file

@ -88,8 +88,8 @@ if [ ! -f $XBPS_SUBPKG_INSTALL_DONE ]; then
install -d $PKGDESTDIR install -d $PKGDESTDIR
if declare -f pkg_install >/dev/null; then if declare -f pkg_install >/dev/null; then
run_pkg_hooks pre-install
export XBPS_PKGDESTDIR=1 export XBPS_PKGDESTDIR=1
run_pkg_hooks pre-install
run_func pkg_install run_func pkg_install
fi fi
fi fi