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

xbps-src: added -S flag to disable XBPS_PREFER_BINPKG_DEPS.

Browse source
This commit is contained in:
Juan RP 2011-07-02 22:56:26 +02:00
parent c124ec1bef
commit 8bc23145c8
3 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
xbps-src/shutils/chroot.sh.in
View file

@ -271,7 +271,7 @@ install_xbps_utils()
xbps_chroot_handler()
{
local action="$1" pkg="$2" norm_builddir="$3" rv=0
local action="$1" pkg="$2" keep_wrksrc="$3" rv=0
local path="/tools/bin:/usr/local/sbin:/usr/local/bin:/bin:/sbin:/usr/bin:/usr/sbin"
[ -z "$action" -o -z "$pkg" ] && return 1
@ -313,15 +313,12 @@ xbps_chroot_handler()
if [ "$action" = "chroot" ]; then
env in_chroot=yes IN_CHROOT=1 LANG=C PATH=$path \
${chroot_cmd} $XBPS_MASTERDIR /bin/sh || \
rv=$?
${chroot_cmd} $XBPS_MASTERDIR /bin/sh || rv=$?
else
[ "$norm_builddir" = "yes" ] && \
action="-C $action"
[ -n "$keep_wrksrc" ] && action="-C $action"
env in_chroot=yes LANG=C PATH=$path _ORIGINPKG="$pkg" \
${chroot_cmd} $XBPS_MASTERDIR sh -c \
"cd /xbps/srcpkgs/$pkg && xbps-src $action" || \
rv=$?
"cd /xbps/srcpkgs/$pkg && xbps-src $action" || rv=$?
fi
msg_normal "Exiting from the chroot on $XBPS_MASTERDIR.\n"

2
xbps-src/shutils/pkgtarget_funcs.sh.in
View file

@ -153,7 +153,7 @@ install_pkg()
#
# Remove $wrksrc if -C not specified.
#
if [ -d "$wrksrc" -a "$dontrm_builddir" = "no" ]; then
if [ -d "$wrksrc" -a -z "$KEEP_WRKSRC" ]; then
remove_tmpl_wrksrc $wrksrc
fi