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

xbps-src: fix regressions introduced with -f <phase>.

Browse source
This commit is contained in:
Juan RP 2015-09-27 10:30:10 +02:00
parent 1f4a588861
commit 21b2f6c3e8
2 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
common/xbps-src/libexec/build.sh
View file

@ -62,10 +62,10 @@ $XBPS_LIBEXECDIR/xbps-src-dobuild.sh $SOURCEPKG $XBPS_CROSS_BUILD || exit 1
[ "$XBPS_TARGET" = "build" ] && exit 0 [ "$XBPS_TARGET" = "build" ] && exit 0
# Install pkgs into destdir. # Install pkgs into destdir.
$XBPS_LIBEXECDIR/xbps-src-doinstall.sh $SOURCEPKG $XBPS_CROSS_BUILD || exit 1 $XBPS_LIBEXECDIR/xbps-src-doinstall.sh $SOURCEPKG no $XBPS_CROSS_BUILD || exit 1
for subpkg in ${subpackages} ${sourcepkg}; do for subpkg in ${subpackages} ${sourcepkg}; do
$XBPS_LIBEXECDIR/xbps-src-doinstall.sh $subpkg $XBPS_CROSS_BUILD || exit 1 $XBPS_LIBEXECDIR/xbps-src-doinstall.sh $subpkg yes $XBPS_CROSS_BUILD || exit 1
done done
for subpkg in ${subpackages} ${sourcepkg}; do for subpkg in ${subpackages} ${sourcepkg}; do
$XBPS_LIBEXECDIR/xbps-src-prepkg.sh $subpkg $XBPS_CROSS_BUILD || exit 1 $XBPS_LIBEXECDIR/xbps-src-prepkg.sh $subpkg $XBPS_CROSS_BUILD || exit 1

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

@ -4,6 +4,7 @@
# #
# Passed arguments: # Passed arguments:
# $1 - pkgname [REQUIRED] # $1 - pkgname [REQUIRED]
# $2 - subpkg mode [REQUIRED]
# $2 - cross target [OPTIONAL] # $2 - cross target [OPTIONAL]
if [ $# -lt 1 -o $# -gt 2 ]; then if [ $# -lt 1 -o $# -gt 2 ]; then
@ -12,7 +13,8 @@ if [ $# -lt 1 -o $# -gt 2 ]; then
fi fi
PKGNAME="$1" PKGNAME="$1"
XBPS_CROSS_BUILD="$2" SUBPKG_MODE="$2"
XBPS_CROSS_BUILD="$3"
for f in $XBPS_SHUTILSDIR/*.sh; do for f in $XBPS_SHUTILSDIR/*.sh; do
. $f . $f
@ -33,7 +35,8 @@ if [ -n "$build_wrksrc" ]; then
cd $build_wrksrc || msg_error "$pkgver: cannot access to build_wrksrc [$build_wrksrc]\n" cd $build_wrksrc || msg_error "$pkgver: cannot access to build_wrksrc [$build_wrksrc]\n"
fi fi
if [ ! -f $XBPS_INSTALL_DONE ] || [ -f $XBPS_INSTALL_DONE -a -n "$XBPS_BUILD_FORCEMODE" ]; then if [ "$SUBPKG_MODE" = "no" ]; then
if [ ! -f $XBPS_INSTALL_DONE ] || [ -f $XBPS_INSTALL_DONE -a -n "$XBPS_BUILD_FORCEMODE" ]; then
mkdir -p $XBPS_DESTDIR/$XBPS_CROSS_TRIPLET/$pkgname-$version mkdir -p $XBPS_DESTDIR/$XBPS_CROSS_TRIPLET/$pkgname-$version
run_pkg_hooks pre-install run_pkg_hooks pre-install
@ -47,7 +50,6 @@ if [ ! -f $XBPS_INSTALL_DONE ] || [ -f $XBPS_INSTALL_DONE -a -n "$XBPS_BUILD_FOR
fi fi
# Run do_install() # Run do_install()
if [ ! -f $XBPS_INSTALL_DONE ]; then
cd "$wrksrc" cd "$wrksrc"
[ -n "$build_wrksrc" ] && cd $build_wrksrc [ -n "$build_wrksrc" ] && cd $build_wrksrc
if declare -f do_install >/dev/null; then if declare -f do_install >/dev/null; then
@ -60,7 +62,6 @@ if [ ! -f $XBPS_INSTALL_DONE ] || [ -f $XBPS_INSTALL_DONE -a -n "$XBPS_BUILD_FOR
run_func do_install run_func do_install
fi fi
touch -f $XBPS_INSTALL_DONE touch -f $XBPS_INSTALL_DONE
fi
# Run post_install() # Run post_install()
if [ ! -f $XBPS_POST_INSTALL_DONE ]; then if [ ! -f $XBPS_POST_INSTALL_DONE ]; then
@ -71,6 +72,7 @@ if [ ! -f $XBPS_INSTALL_DONE ] || [ -f $XBPS_INSTALL_DONE -a -n "$XBPS_BUILD_FOR
touch -f $XBPS_POST_INSTALL_DONE touch -f $XBPS_POST_INSTALL_DONE
fi fi
fi fi
fi
exit 0 exit 0
fi fi