teldra
/
vp-build
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xbps.sh: fix runstuff by removing a spurious char! 

Also unset some vars ASAP if they aren't used anymore.

--HG--
extra : convert_revision : 055ecc0e1dced7ed2d123d11d9e8baf4074e8b61
This commit is contained in:
Juan RP 2008-10-13 09:08:10 +02:00
parent 84d4f6391a
commit 0f17943ee8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xbps.sh
View File

@ -593,9 +593,10 @@ configure_src_phase()
# Run stuff before configure. # Run stuff before configure.
local rbcf="$XBPS_TEMPLATESDIR/$pkgname-runstuff-before-configure.sh" local rbcf="$XBPS_TEMPLATESDIR/$pkgname-runstuff-before-configure.sh"
[ -f $rbcf ] && . $rbcf [ -f "$rbcf" ] && . $rbcf
[ -n "$run_stuff_before_configure_cmd" ] && \ [ -n "$run_stuff_before_configure_cmd" ] && \
${run_stuff_before_configure_cmd} ${run_stuff_before_configure_cmd}
unset rbcf
# Export configure_env vars. # Export configure_env vars.
for f in ${configure_env}; do for f in ${configure_env}; do
@ -705,10 +706,10 @@ build_src_phase()
# #
# Run template stuff before building. # Run template stuff before building.
# #
local rbbf="$XBPS_TEMPLATESDIR/$pkgname-runstuff-before-build.sh"a local rbbf="$XBPS_TEMPLATESDIR/$pkgname-runstuff-before-build.sh"
[ -f $rbbf ] && . $rbbf [ -f $rbbf ] && . $rbbf
[ -n "$run_stuff_before_build_cmd" ] && ${run_stuff_before_build_cmd} [ -n "$run_stuff_before_build_cmd" ] && ${run_stuff_before_build_cmd}
unset rbbf
[ -z "$make_build_target" ] && make_build_target= [ -z "$make_build_target" ] && make_build_target=
[ -n "$XBPS_MAKEJOBS" ] && XBPS_MAKEJOBS="-j$XBPS_MAKEJOBS" [ -n "$XBPS_MAKEJOBS" ] && XBPS_MAKEJOBS="-j$XBPS_MAKEJOBS"
@ -733,6 +734,7 @@ build_src_phase()
local rbif="$XBPS_TEMPLATESDIR/$pkgname-runstuff-before-install.sh" local rbif="$XBPS_TEMPLATESDIR/$pkgname-runstuff-before-install.sh"
[ -f $rbif ] && . $rbif [ -f $rbif ] && . $rbif
[ -n "$run_stuff_before_install_cmd" ] && ${run_stuff_before_install_cmd} [ -n "$run_stuff_before_install_cmd" ] && ${run_stuff_before_install_cmd}
unset rbif
$touch_cmd -f $XBPS_BUILD_DONE $touch_cmd -f $XBPS_BUILD_DONE
} }
@ -784,6 +786,7 @@ install_src_phase()
local raif="$XBPS_TEMPLATESDIR/$pkgname-runstuff-after-install.sh" local raif="$XBPS_TEMPLATESDIR/$pkgname-runstuff-after-install.sh"
[ -f $raif ] && . $raif [ -f $raif ] && . $raif
[ -n "$run_stuff_after_install_cmd" ] && ${run_stuff_after_install_cmd} [ -n "$run_stuff_after_install_cmd" ] && ${run_stuff_after_install_cmd}
unset raif
# #
# Transform pkg-config files if requested by template. # Transform pkg-config files if requested by template.