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

xbps-src: return 0 on success, 1 on error and 2 on nocross/broken (ignore).

Browse source
This commit is contained in:
Juan RP 2015-03-19 10:08:02 +01:00
parent bc3c2eecaf
commit 0337b86f43
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -29,7 +29,7 @@ install_cross_pkg $XBPS_CROSS_BUILD
# Install dependencies from binary packages # Install dependencies from binary packages
if [ "$PKGNAME" != "$TARGET_PKG" -o -z "$XBPS_SKIP_DEPS" ]; then if [ "$PKGNAME" != "$TARGET_PKG" -o -z "$XBPS_SKIP_DEPS" ]; then
install_pkg_deps $PKGNAME $TARGET_PKG pkg $XBPS_CROSS_BUILD || exit 1 install_pkg_deps $PKGNAME $TARGET_PKG pkg $XBPS_CROSS_BUILD || exit $?
fi fi
# Fetch distfiles after installing required dependencies, # Fetch distfiles after installing required dependencies,

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

@ -348,8 +348,8 @@ install_pkg_deps() {
setup_pkg $pkg setup_pkg $pkg
msg_error "$pkgver: required host dependency '$i' cannot be resolved!\n" msg_error "$pkgver: required host dependency '$i' cannot be resolved!\n"
fi fi
exec env XBPS_BINPKG_EXISTS=1 $XBPS_LIBEXECDIR/build.sh $sourcepkg $pkg $target || exit 1 exec env XBPS_BINPKG_EXISTS=1 $XBPS_LIBEXECDIR/build.sh $sourcepkg $pkg $target || exit $?
) || exit 1 ) || exit $?
host_binpkg_deps+=("$i") host_binpkg_deps+=("$i")
done done
@ -364,8 +364,8 @@ install_pkg_deps() {
setup_pkg $pkg $cross setup_pkg $pkg $cross
msg_error "$pkgver: required target dependency '$i' cannot be resolved!\n" msg_error "$pkgver: required target dependency '$i' cannot be resolved!\n"
fi fi
exec env XBPS_BINPKG_EXISTS=1 $XBPS_LIBEXECDIR/build.sh $sourcepkg $pkg $target $cross || exit 1 exec env XBPS_BINPKG_EXISTS=1 $XBPS_LIBEXECDIR/build.sh $sourcepkg $pkg $target $cross || exit $?
) || exit 1 ) || exit $?
binpkg_deps+=("$i") binpkg_deps+=("$i")
done done

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

@ -425,11 +425,11 @@ setup_pkg() {
if [ "$cross" -a "$nocross" ]; then if [ "$cross" -a "$nocross" ]; then
msg_red "$pkgver: cannot be cross compiled, exiting...\n" msg_red "$pkgver: cannot be cross compiled, exiting...\n"
exit 0 exit 2
elif [ "$broken" ]; then elif [ "$broken" ]; then
msg_red "$pkgver: cannot be built, it's currently broken; see the build log:\n" msg_red "$pkgver: cannot be built, it's currently broken; see the build log:\n"
msg_red "$pkgver: $broken\n" msg_red "$pkgver: $broken\n"
exit 0 exit 2
fi fi
export XBPS_STATEDIR="${XBPS_BUILDDIR}/.xbps-${sourcepkg}" export XBPS_STATEDIR="${XBPS_BUILDDIR}/.xbps-${sourcepkg}"

2
xbps-src
View file

@ -618,7 +618,7 @@ case "$XBPS_TARGET" in
else else
[ -z "$XBPS_TEMP_MASTERDIR" ] && remove_pkg_autodeps [ -z "$XBPS_TEMP_MASTERDIR" ] && remove_pkg_autodeps
$XBPS_LIBEXECDIR/build.sh $XBPS_TARGET_PKG $XBPS_TARGET_PKG \ $XBPS_LIBEXECDIR/build.sh $XBPS_TARGET_PKG $XBPS_TARGET_PKG \
$XBPS_TARGET $XBPS_CROSS_BUILD || exit 1 $XBPS_TARGET $XBPS_CROSS_BUILD || exit $?
fi fi
;; ;;
remove|remove-destdir) remove|remove-destdir)