archr/Arch-R
0
0
Fork 0
mirror of https://github.com/archr-linux/Arch-R.git synced 2026-03-31 14:41:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

buildsystem: restore set -e fail-on-error behaviour

Browse Source
This commit is contained in:
MilhouseVH
2019-01-21 13:15:11 +00:00
parent 34ac6023dc
commit 0661263dd8
6 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/unpack
View File

@@ -44,9 +44,11 @@ fi
if [ -d "$SOURCES/$1" -o -d "$PKG_DIR/sources" ]; then
build_msg "CLR_UNPACK" "UNPACK" "${1}" "indent"
pkg_call_optional pre_unpack
pkg_call_exists pre_unpack && pkg_call pre_unpack
if ! pkg_call unpack; then
if pkg_call_exists unpack; then
pkg_call unpack
else
if [ -n "$PKG_URL" ]; then
$SCRIPTS/extract $1 $BUILD
fi
@@ -69,10 +71,10 @@ if [ -d "$SOURCES/$1" -o -d "$PKG_DIR/sources" ]; then
mkdir -p "${PKG_BUILD}"
fi
pkg_call_optional post_unpack
pkg_call_exists post_unpack && pkg_call post_unpack
if [ "${PKG_SKIP_PATCHES}" != "yes" ]; then
pkg_call_optional pre_patch
pkg_call_exists pre_patch && pkg_call pre_patch
if [ "$TARGET_ARCH" = "x86_64" ]; then
PATCH_ARCH="x86"
@@ -141,7 +143,7 @@ if [ -d "$SOURCES/$1" -o -d "$PKG_DIR/sources" ]; then
fi
done
pkg_call_optional post_patch
pkg_call_exists post_patch && pkg_call post_patch
fi
if [ ! "$PKG_NAME" = "configtools" ] ; then