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

xbps-src: -f <phase> now works for configure/build/install/pkg phases.

Browse source
This commit is contained in:
Juan RP 2015-09-24 15:45:47 +02:00
parent 0450668a5e
commit 08efa2cca1
6 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -33,13 +33,13 @@ if [ -n "$build_wrksrc" ]; then
cd $build_wrksrc || msg_error "$pkgver: cannot access to build_wrksrc [$build_wrksrc]\n"
fi
if [ ! -f $XBPS_INSTALL_DONE ]; then
if [ -z "$XBPS_BUILD_FORCEMODE" -a ! -f $XBPS_INSTALL_DONE ]; then
mkdir -p $XBPS_DESTDIR/$XBPS_CROSS_TRIPLET/$pkgname-$version
run_pkg_hooks pre-install
# Run pre_install()
if [ ! -f $XBPS_PRE_INSTALL_DONE ]; then
if [ -z "$XBPS_BUILD_FORCEMODE" -a ! -f $XBPS_PRE_INSTALL_DONE ]; then
if declare -f pre_install >/dev/null; then
run_func pre_install
touch -f $XBPS_PRE_INSTALL_DONE
@ -47,7 +47,7 @@ if [ ! -f $XBPS_INSTALL_DONE ]; then
fi
# Run do_install()
if [ ! -f $XBPS_INSTALL_DONE ]; then
if [ -z "$XBPS_BUILD_FORCEMODE" -a ! -f $XBPS_INSTALL_DONE ]; then
cd "$wrksrc"
[ -n "$build_wrksrc" ] && cd $build_wrksrc
if declare -f do_install >/dev/null; then
@ -63,7 +63,7 @@ if [ ! -f $XBPS_INSTALL_DONE ]; then
fi
# Run post_install()
if [ ! -f $XBPS_POST_INSTALL_DONE ]; then
if [ -z "$XBPS_BUILD_FORCEMODE" -a ! -f $XBPS_POST_INSTALL_DONE ]; then
cd "$wrksrc"
[ -n "$build_wrksrc" ] && cd $build_wrksrc
if declare -f post_install >/dev/null; then
@ -77,7 +77,7 @@ fi
XBPS_SUBPKG_INSTALL_DONE="${XBPS_STATEDIR}/${PKGNAME}_${XBPS_CROSS_BUILD}_subpkg_install_done"
# If it's a subpkg execute the pkg_install() function.
if [ ! -f $XBPS_SUBPKG_INSTALL_DONE ]; then
if [ -z "$XBPS_BUILD_FORCEMODE" -a ! -f $XBPS_SUBPKG_INSTALL_DONE ]; then
if [ "$sourcepkg" != "$PKGNAME" ]; then
# Source all subpkg environment setup snippets.
for f in ${XBPS_COMMONDIR}/environment/setup-subpkg/*.sh; do