common/libexec: remove redundant pre/do/post preparation code
This pullrequest removes redundant codepaths in xbps-src-do{build,configure,install}.sh and joins the code in the run_step function. This causes slightly different behavior to do_install: Do install will chdir to wrksrc only _before_ the first step. The current behavior is that pre_install will run without a chdir, do_ and post_ is runned with a chdir. This is a subtle but breaking change and may cause some templates to break at install phase.
This commit is contained in:
parent
ac0ca9945a
commit
ba84655a13
4 changed files with 51 additions and 95 deletions
|
@ -31,40 +31,7 @@ for f in $XBPS_COMMONDIR/environment/configure/*.sh; do
|
|||
source_file "$f"
|
||||
done
|
||||
|
||||
cd "$wrksrc" || msg_error "$pkgver: cannot access wrksrc directory [$wrksrc].\n"
|
||||
if [ -n "$build_wrksrc" ]; then
|
||||
cd $build_wrksrc || \
|
||||
msg_error "$pkgver: cannot access build_wrksrc directory [$build_wrksrc].\n"
|
||||
fi
|
||||
|
||||
run_pkg_hooks pre-configure
|
||||
|
||||
# Run pre_configure()
|
||||
if declare -f pre_configure >/dev/null; then
|
||||
run_func pre_configure
|
||||
fi
|
||||
|
||||
# Run do_configure()
|
||||
if declare -f do_configure >/dev/null; then
|
||||
run_func do_configure
|
||||
else
|
||||
if [ -n "$build_style" ]; then
|
||||
if [ ! -r $XBPS_BUILDSTYLEDIR/${build_style}.sh ]; then
|
||||
msg_error "$pkgver: cannot find build helper $XBPS_BUILDSTYLEDIR/${build_style}.sh!\n"
|
||||
fi
|
||||
. $XBPS_BUILDSTYLEDIR/${build_style}.sh
|
||||
if declare -f do_configure >/dev/null; then
|
||||
run_func do_configure
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Run post_configure()
|
||||
if declare -f post_configure >/dev/null; then
|
||||
run_func post_configure
|
||||
fi
|
||||
|
||||
run_pkg_hooks post-configure
|
||||
run_step configure optional
|
||||
|
||||
touch -f $XBPS_CONFIGURE_DONE
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue