When using run_func() we don't care about stderr output.
--HG-- extra : convert_revision : 618d1c2eda49e1c55abec28d36f3430f37b9b867
This commit is contained in:
parent
6bb4ee33b0
commit
33770e8bbc
4 changed files with 11 additions and 11 deletions
|
@ -84,18 +84,18 @@ install_src_phase()
|
|||
fi
|
||||
|
||||
# Run pre_install func.
|
||||
run_func pre_install || msg_error "pre_install stage failed!"
|
||||
run_func pre_install 2>/dev/null || 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 || msg_error "do_install stage failed!"
|
||||
run_func do_install 2>/dev/null || msg_error "do_install stage failed!"
|
||||
;;
|
||||
python-module)
|
||||
. $XBPS_HELPERSDIR/python-module.sh
|
||||
run_func do_install || msg_error "python module install failed!"
|
||||
run_func do_install 2>/dev/null || msg_error "python module install failed!"
|
||||
;;
|
||||
*)
|
||||
make_install $lver
|
||||
|
@ -103,7 +103,7 @@ install_src_phase()
|
|||
esac
|
||||
|
||||
# Run post_install func.
|
||||
run_func post_install || msg_error "post_install stage failed!"
|
||||
run_func post_install 2>/dev/null || msg_error "post_install stage failed!"
|
||||
|
||||
# Remove libtool archives by default.
|
||||
if [ -z "$keep_libtool_archives" ]; then
|
||||
|
@ -148,7 +148,7 @@ install_src_phase()
|
|||
. $XBPS_SRCPKGDIR/${sourcepkg}/${subpkg}.template
|
||||
pkgname=${subpkg}
|
||||
set_tmpl_common_vars
|
||||
run_func do_install || \
|
||||
run_func do_install 2>/dev/null || \
|
||||
msg_error "$pkgname do_install stage failed!"
|
||||
done
|
||||
|
||||
|
|
|
@ -57,7 +57,7 @@ build_src_phase()
|
|||
makejobs="-j$XBPS_MAKEJOBS"
|
||||
fi
|
||||
# Run pre_build func.
|
||||
run_func pre_build || msg_error "pre_build stage failed!"
|
||||
run_func pre_build 2>/dev/null || msg_error "pre_build stage failed!"
|
||||
|
||||
. $XBPS_SHUTILSDIR/buildvars_funcs.sh
|
||||
set_build_vars
|
||||
|
@ -65,7 +65,7 @@ build_src_phase()
|
|||
msg_normal "Running build phase for $pkg."
|
||||
|
||||
if [ "$build_style" = "custom-install" ]; then
|
||||
run_func do_build || msg_error "do_build stage failed!"
|
||||
run_func do_build 2>/dev/null || msg_error "do_build stage failed!"
|
||||
else
|
||||
#
|
||||
# Build package via make.
|
||||
|
@ -75,7 +75,7 @@ build_src_phase()
|
|||
fi
|
||||
|
||||
# Run post_build func.
|
||||
run_func post_build || msg_error "post_build stage failed!"
|
||||
run_func post_build 2>/dev/null || msg_error "post_build stage failed!"
|
||||
|
||||
unset makejobs
|
||||
|
||||
|
|
|
@ -58,7 +58,7 @@ configure_src_phase()
|
|||
cd $wrksrc || msg_error "unexistent build directory [$wrksrc]."
|
||||
|
||||
# Run pre_configure func.
|
||||
run_func pre_configure || msg_error "pre_configure stage failed!"
|
||||
run_func pre_configure 2>/dev/null || msg_error "pre_configure stage failed!"
|
||||
|
||||
# Export configure_env vars.
|
||||
for f in ${configure_env}; do
|
||||
|
@ -114,7 +114,7 @@ configure_src_phase()
|
|||
fi
|
||||
|
||||
# Run post_configure func.
|
||||
run_func post_configure || msg_error "post_configure stage failed!"
|
||||
run_func post_configure 2>/dev/null || msg_error "post_configure stage failed!"
|
||||
|
||||
# unset configure_env vars.
|
||||
for f in ${configure_env}; do
|
||||
|
|
|
@ -67,7 +67,7 @@ fetch_distfiles()
|
|||
# entirely and run the do_fetch() function.
|
||||
#
|
||||
if [ -n "$nofetch" ]; then
|
||||
cd ${XBPS_BUILDDIR} && run_func do_fetch
|
||||
cd ${XBPS_BUILDDIR} && run_func do_fetch 2>/dev/null
|
||||
return $?
|
||||
fi
|
||||
|
||||
|
|
Loading…
Reference in a new issue