Redirect stderr to a file in ${wrksrc} for run_func().
So that you can use 'set -x' in a template and see the output. --HG-- extra : convert_revision : 7b3225b2ed3f1fab410c43af12f5d5f66f8504d7
This commit is contained in:
parent
c05b8185be
commit
6baa28a6e3
3 changed files with 24 additions and 12 deletions
|
@ -89,26 +89,31 @@ install_src_phase()
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Run pre_install func.
|
# 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."
|
msg_normal "Running install phase for $pkgname-$lver."
|
||||||
|
|
||||||
# Type of installation: custom, make or python.
|
# Type of installation: custom, make or python.
|
||||||
case "$build_style" in
|
case "$build_style" in
|
||||||
custom-install)
|
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)
|
python-module)
|
||||||
. $XBPS_HELPERSDIR/python-module.sh
|
. $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
|
esac
|
||||||
|
cd ${wrksrc} || msg_error "can't change cwd to wrksrc!"
|
||||||
|
|
||||||
# Run post_install func.
|
# 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.
|
# Remove libtool archives by default.
|
||||||
if [ -z "$keep_libtool_archives" ]; then
|
if [ -z "$keep_libtool_archives" ]; then
|
||||||
|
@ -153,7 +158,8 @@ install_src_phase()
|
||||||
. $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template
|
. $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template
|
||||||
pkgname=${subpkg}
|
pkgname=${subpkg}
|
||||||
set_tmpl_common_vars
|
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!"
|
msg_error "$pkgname do_install stage failed!"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,8 @@ build_src_phase()
|
||||||
makejobs="-j$XBPS_MAKEJOBS"
|
makejobs="-j$XBPS_MAKEJOBS"
|
||||||
fi
|
fi
|
||||||
# Run pre_build func.
|
# Run pre_build func.
|
||||||
run_func pre_build 2>/dev/null || msg_error "pre_build stage failed!"
|
run_func pre_build 2>${wrksrc}/.xbps_pre_build.log \
|
||||||
|
|| msg_error "pre_build stage failed!"
|
||||||
|
|
||||||
. $XBPS_SHUTILSDIR/buildvars_funcs.sh
|
. $XBPS_SHUTILSDIR/buildvars_funcs.sh
|
||||||
set_build_vars
|
set_build_vars
|
||||||
|
@ -65,17 +66,20 @@ build_src_phase()
|
||||||
msg_normal "Running build phase for $pkg."
|
msg_normal "Running build phase for $pkg."
|
||||||
|
|
||||||
if [ "$build_style" = "custom-install" ]; then
|
if [ "$build_style" = "custom-install" ]; then
|
||||||
run_func do_build 2>/dev/null || msg_error "do_build stage failed!"
|
run_func do_build 2>${wrksrc}/.xbps_do_build.log \
|
||||||
|
|| msg_error "do_build stage failed!"
|
||||||
else
|
else
|
||||||
#
|
#
|
||||||
# Build package via make.
|
# Build package via make.
|
||||||
#
|
#
|
||||||
${make_cmd} ${makejobs} ${make_build_args} ${make_build_target}
|
${make_cmd} ${makejobs} ${make_build_args} \
|
||||||
|
${make_build_target} 2>${wrksrc}/.xbps_make_build.log
|
||||||
[ $? -ne 0 ] && msg_error "building $pkg (build phase)."
|
[ $? -ne 0 ] && msg_error "building $pkg (build phase)."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Run post_build func.
|
# Run post_build func.
|
||||||
run_func post_build 2>/dev/null || msg_error "post_build stage failed!"
|
run_func post_build 2>${wrksrc}/.xbps_post_build.log \
|
||||||
|
|| msg_error "post_build stage failed!"
|
||||||
|
|
||||||
unset makejobs
|
unset makejobs
|
||||||
|
|
||||||
|
|
|
@ -58,7 +58,8 @@ configure_src_phase()
|
||||||
cd $wrksrc || msg_error "unexistent build directory [$wrksrc]."
|
cd $wrksrc || msg_error "unexistent build directory [$wrksrc]."
|
||||||
|
|
||||||
# Run pre_configure func.
|
# Run pre_configure func.
|
||||||
run_func pre_configure 2>/dev/null || msg_error "pre_configure stage failed!"
|
run_func pre_configure 2>${wrksrc}/.xbps_pre_configure.log \
|
||||||
|
|| msg_error "pre_configure stage failed!"
|
||||||
|
|
||||||
# Export configure_env vars.
|
# Export configure_env vars.
|
||||||
for f in ${configure_env}; do
|
for f in ${configure_env}; do
|
||||||
|
@ -114,7 +115,8 @@ configure_src_phase()
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Run post_configure func.
|
# Run post_configure func.
|
||||||
run_func post_configure 2>/dev/null || msg_error "post_configure stage failed!"
|
run_func post_configure 2>${wrksrc}/.xbps_post_configure.log \
|
||||||
|
|| msg_error "post_configure stage failed!"
|
||||||
|
|
||||||
# unset configure_env vars.
|
# unset configure_env vars.
|
||||||
for f in ${configure_env}; do
|
for f in ${configure_env}; do
|
||||||
|
|
Loading…
Reference in a new issue