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

meta: make do-patch run hooks regardless

Browse source
This commit is contained in:
maxice8 2019-02-28 07:44:58 -03:00
parent 1f79a0d49e
commit 8a028866dc
No known key found for this signature in database
GPG key ID: 543B9D4F4299F06B
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
common/xbps-src/libexec/xbps-src-dopatch.sh
View file

@ -40,7 +40,7 @@ if declare -f pre_patch >/dev/null; then
run_func pre_patch run_func pre_patch
fi fi
# If template defines do_patch() use it rather than the hooks. # If template defines do_patch() use it rather than the build-style.
if declare -f do_patch >/dev/null; then if declare -f do_patch >/dev/null; then
run_func do_patch run_func do_patch
else else
@ -49,16 +49,15 @@ else
msg_error "$pkgver: cannot find build helper $XBPS_BUILDSTYLEDIR/${build_style}.sh!\n" msg_error "$pkgver: cannot find build helper $XBPS_BUILDSTYLEDIR/${build_style}.sh!\n"
fi fi
. $XBPS_BUILDSTYLEDIR/${build_style}.sh . $XBPS_BUILDSTYLEDIR/${build_style}.sh
fi
# If the build_style script declares do_patch(), use it rather than hooks. if declare -f do_patch >/dev/null; then
if declare -f do_patch >/dev/null; then run_func do_patch
run_func do_patch fi
else
# Run do-patch hooks
run_pkg_hooks "do-patch"
fi fi
fi fi
# Run do-patch hooks
run_pkg_hooks "do-patch"
# If template defines post_patch(), use it. # If template defines post_patch(), use it.
if declare -f post_patch >/dev/null; then if declare -f post_patch >/dev/null; then