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

xbps-src: force autodeps cleanup while building dependencies.

Browse source 
Before that change, "./xbps-src -C pkg foo" would not remove dependencies
installed by previous builds required by foo.
This commit is contained in:
Juan RP 2015-05-02 03:40:52 +02:00
parent 65727584e0
commit 4f67c26652
3 changed files with 5 additions and 5 deletions
common/xbps-src
libexec
build.sh
shutils
build_dependencies.shpkgtarget.sh

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

@ -83,7 +83,7 @@ if declare -f do_clean >/dev/null; then
run_func do_clean run_func do_clean
fi fi
if [ -z "$XBPS_KEEP_ALL" ]; then if [ -n "$XBPS_DEPENDENCY" -o -z "$XBPS_KEEP_ALL" ]; then
remove_pkg_autodeps remove_pkg_autodeps
remove_pkg_wrksrc remove_pkg_wrksrc
remove_pkg $XBPS_CROSS_BUILD remove_pkg $XBPS_CROSS_BUILD

6
common/xbps-src/shutils/build_dependencies.sh
View file

@ -344,7 +344,8 @@ install_pkg_deps() {
( (
curpkgdepname=$($XBPS_UHELPER_CMD getpkgname "$i" 2>/dev/null) curpkgdepname=$($XBPS_UHELPER_CMD getpkgname "$i" 2>/dev/null)
setup_pkg $curpkgdepname $cross setup_pkg $curpkgdepname $cross
exec env XBPS_BINPKG_EXISTS=1 $XBPS_LIBEXECDIR/build.sh $sourcepkg $pkg $target $cross $cross_prepare || exit $? exec env XBPS_DEPENDENCY=1 XBPS_BINPKG_EXISTS=1 \
$XBPS_LIBEXECDIR/build.sh $sourcepkg $pkg $target $cross $cross_prepare || exit $?
) || exit $? ) || exit $?
binpkg_deps+=("$i") binpkg_deps+=("$i")
done done
@ -361,7 +362,8 @@ install_pkg_deps() {
fi fi
fi fi
setup_pkg $curpkgdepname $cross setup_pkg $curpkgdepname $cross
exec env XBPS_BINPKG_EXISTS=1 $XBPS_LIBEXECDIR/build.sh $sourcepkg $pkg $target $cross $cross_prepare || exit $? exec env XBPS_DEPENDENCY=1 XBPS_BINPKG_EXISTS=1 \
$XBPS_LIBEXECDIR/build.sh $sourcepkg $pkg $target $cross $cross_prepare || exit $?
) || exit $? ) || exit $?
done done

2
common/xbps-src/shutils/pkgtarget.sh
View file

@ -43,8 +43,6 @@ pkg_available() {
remove_pkg_autodeps() { remove_pkg_autodeps() {
local rval= tmplogf= local rval= tmplogf=
[ -n "$XBPS_KEEP_ALL" ] && return 0
cd $XBPS_MASTERDIR || return 1 cd $XBPS_MASTERDIR || return 1
msg_normal "${pkgver:-xbps-src}: removing autodeps, please wait...\n" msg_normal "${pkgver:-xbps-src}: removing autodeps, please wait...\n"
tmplogf=$(mktemp) tmplogf=$(mktemp)