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

Redirect stderr to a file in ${wrksrc} for run_func().

Browse source 
So that you can use 'set -x' in a template and see the output.

--HG--
extra : convert_revision : 7b3225b2ed3f1fab410c43af12f5d5f66f8504d7
This commit is contained in:
Juan RP 2010-04-29 16:04:09 +02:00
parent c05b8185be
commit 6baa28a6e3
3 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
xbps-src/libexec/xbps-src-doinst-helper.sh.in
View file

@ -89,26 +89,31 @@ install_src_phase()
fi
# Run pre_install func.
run_func pre_install 2>/dev/null || msg_error "pre_install stage failed!"
run_func pre_install 2>${wrksrc}/.xbps_pre_install.log \
|| msg_error "pre_install stage failed!"
msg_normal "Running install phase for $pkgname-$lver."
# Type of installation: custom, make or python.
case "$build_style" in
custom-install)
run_func do_install 2>/dev/null || msg_error "do_install stage failed!"
run_func do_install 2>${wrksrc}/.xbps_do_install.log \
|| msg_error "do_install stage failed!"
;;
python-module)
. $XBPS_HELPERSDIR/python-module.sh
run_func do_install 2>/dev/null || msg_error "python module install failed!"
run_func do_install 2>${wrksrc}/.xbps_do_install.log \
|| msg_error "python module install failed!"
;;
*)
make_install $lver
make_install $lver 2>${wrksrc}/.xbps_make_install.log
;;
esac
cd ${wrksrc} || msg_error "can't change cwd to wrksrc!"
# Run post_install func.
run_func post_install 2>/dev/null || msg_error "post_install stage failed!"
run_func post_install 2>${wrksrc}/.xbps_post_install.log \
|| msg_error "post_install stage failed!"
# Remove libtool archives by default.
if [ -z "$keep_libtool_archives" ]; then
@ -153,7 +158,8 @@ install_src_phase()
. $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template
pkgname=${subpkg}
set_tmpl_common_vars
run_func do_install 2>/dev/null || \
run_func do_install \
2>${wrksrc}/.xbps_do_install_${pkgname}.log || \
msg_error "$pkgname do_install stage failed!"
done