snailed/void-packages
2
0
Fork 0
Code Issues 1 Pull requests 2 Activity Actions

xbps-src: add informative run mode

Browse source
This commit is contained in:
Toyam Cox 2017-08-07 00:33:13 -04:00
parent d680fba5eb
commit 5a7e73b89a
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
common/xbps-src/shutils/common.sh
View file

@ -58,7 +58,7 @@ msg_red_nochroot() {
msg_error() { msg_error() {
msg_red "$@" msg_red "$@"
exit 1 [ -n "$XBPS_INFORMATIVE_RUN" ] || exit 1
} }
msg_warn() { msg_warn() {
@ -95,7 +95,6 @@ set_build_options() {
return 0 return 0
fi fi
for f in ${build_options}; do for f in ${build_options}; do
_pkgname=${pkgname//\-/\_} _pkgname=${pkgname//\-/\_}
_pkgname=${_pkgname//\+/\_} _pkgname=${_pkgname//\+/\_}

4
xbps-src
View file

@ -322,7 +322,6 @@ reconfigure_bootstrap_pkgs() {
touch -f $statefile touch -f $statefile
} }
bootstrap_update() { bootstrap_update() {
if [ -z "$CHROOT_READY" ]; then if [ -z "$CHROOT_READY" ]; then
return return
@ -415,7 +414,7 @@ readonly XBPS_GCC_VERSION=${XBPS_GCC_VERSION_MAJOR}.${XBPS_GCC_VERSION_MINOR}.${
# main() # main()
# #
XBPS_OPTIONS= XBPS_OPTIONS=
XBPS_OPTSTRING="a:CEfgGhH:Ij:Lm:No:qr:tV" XBPS_OPTSTRING="a:CEfgGhH:iIj:Lm:No:qr:tV"
# Preprocess arguments in order to allow options before and after XBPS_TARGET. # Preprocess arguments in order to allow options before and after XBPS_TARGET.
eval set -- $(getopt "$XBPS_OPTSTRING" "$@"); eval set -- $(getopt "$XBPS_OPTSTRING" "$@");
@ -430,6 +429,7 @@ while getopts "$XBPS_OPTSTRING" opt; do
g) readonly XBPS_DEBUG_PKGS=1; XBPS_OPTIONS+=" -g";; g) readonly XBPS_DEBUG_PKGS=1; XBPS_OPTIONS+=" -g";;
H) readonly XBPS_HOSTDIR="$(readlink -f $OPTARG 2>/dev/null)"; XBPS_OPTIONS+=" -H $XBPS_HOSTDIR";; H) readonly XBPS_HOSTDIR="$(readlink -f $OPTARG 2>/dev/null)"; XBPS_OPTIONS+=" -H $XBPS_HOSTDIR";;
h) usage && exit 0;; h) usage && exit 0;;
i) export XBPS_INFORMATIVE_RUN=1; XBPS_OPTIONS+=" -i";;
I) readonly XBPS_SKIP_DEPS=1; XBPS_OPTIONS+=" -I";; I) readonly XBPS_SKIP_DEPS=1; XBPS_OPTIONS+=" -I";;
j) export XBPS_MAKEJOBS="$OPTARG"; XBPS_OPTIONS+=" -j $OPTARG";; j) export XBPS_MAKEJOBS="$OPTARG"; XBPS_OPTIONS+=" -j $OPTARG";;
L) export NOCOLORS=1; XBPS_OPTIONS+=" -L";; L) export NOCOLORS=1; XBPS_OPTIONS+=" -L";;