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

When using run_func() we don't care about stderr output.

Browse source 
--HG--
extra : convert_revision : 618d1c2eda49e1c55abec28d36f3430f37b9b867
This commit is contained in:
Juan RP 2010-04-22 06:50:11 +02:00
parent 6bb4ee33b0
commit 33770e8bbc
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -84,18 +84,18 @@ install_src_phase()
fi fi
# Run pre_install func. # 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." 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 || msg_error "do_install stage failed!" run_func do_install 2>/dev/null || msg_error "do_install stage failed!"
;; ;;
python-module) python-module)
. $XBPS_HELPERSDIR/python-module.sh . $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 make_install $lver
@ -103,7 +103,7 @@ install_src_phase()
esac esac
# Run post_install func. # 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. # Remove libtool archives by default.
if [ -z "$keep_libtool_archives" ]; then if [ -z "$keep_libtool_archives" ]; then
@ -148,7 +148,7 @@ 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 || \ run_func do_install 2>/dev/null || \
msg_error "$pkgname do_install stage failed!" msg_error "$pkgname do_install stage failed!"
done done

6
xbps-src/shutils/build_funcs.sh
View file

@ -57,7 +57,7 @@ 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 || msg_error "pre_build stage failed!" run_func pre_build 2>/dev/null || msg_error "pre_build stage failed!"
. $XBPS_SHUTILSDIR/buildvars_funcs.sh . $XBPS_SHUTILSDIR/buildvars_funcs.sh
set_build_vars set_build_vars
@ -65,7 +65,7 @@ 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 || msg_error "do_build stage failed!" run_func do_build 2>/dev/null || msg_error "do_build stage failed!"
else else
# #
# Build package via make. # Build package via make.
@ -75,7 +75,7 @@ build_src_phase()
fi fi
# Run post_build func. # 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 unset makejobs

4
xbps-src/shutils/configure_funcs.sh
View file

@ -58,7 +58,7 @@ 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 || msg_error "pre_configure stage failed!" run_func pre_configure 2>/dev/null || 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 +114,7 @@ configure_src_phase()
fi fi
# Run post_configure func. # 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. # unset configure_env vars.
for f in ${configure_env}; do for f in ${configure_env}; do

2
xbps-src/shutils/fetch_funcs.sh
View file

@ -67,7 +67,7 @@ fetch_distfiles()
# entirely and run the do_fetch() function. # entirely and run the do_fetch() function.
# #
if [ -n "$nofetch" ]; then if [ -n "$nofetch" ]; then
cd ${XBPS_BUILDDIR} && run_func do_fetch cd ${XBPS_BUILDDIR} && run_func do_fetch 2>/dev/null
return $? return $?
fi fi