snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

Fix conditionals for $build_wrksrc. 

--HG--
extra : convert_revision : c85c8bed3cf76b909ae08b40bb73e9585e9656dc
This commit is contained in:
Juan RP 2009-12-30 22:33:30 +01:00
parent 80302acf87
commit 1667c062b8
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xbps-src/shutils/build_funcs.sh
View File

@ -44,7 +44,9 @@ build_src_phase()
[ ! -d $wrksrc ] && msg_error "unexistent build directory [$wrksrc]" [ ! -d $wrksrc ] && msg_error "unexistent build directory [$wrksrc]"
cd $wrksrc || return 1 cd $wrksrc || return 1
[ -n "$build_wrksrc" ] && cd $build_wrksrc || return 1 if [ -n "$build_wrksrc" ]; then
cd $build_wrksrc || return 1
fi
[ -n "$revision" ] && pkg="${pkg}_${revision}" [ -n "$revision" ] && pkg="${pkg}_${revision}"

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

@ -69,7 +69,9 @@ configure_src_phase()
[ -z "$configure_script" ] && configure_script="./configure" [ -z "$configure_script" ] && configure_script="./configure"
cd $wrksrc || return 1 cd $wrksrc || return 1
[ -n "$build_wrksrc" ] && cd $build_wrksrc || return 1 if [ -n "$build_wrksrc" ]; then
cd $build_wrksrc || return 1
fi
. $XBPS_SHUTILSDIR/buildvars_funcs.sh . $XBPS_SHUTILSDIR/buildvars_funcs.sh
set_build_vars set_build_vars

6
xbps-src/shutils/install_funcs.sh
View File

@ -71,8 +71,10 @@ install_src_phase()
saved_wrksrc=$wrksrc saved_wrksrc=$wrksrc
cd $wrksrc || msg_error "can't change cwd to wrksrc!" cd $wrksrc || msg_error "can't change cwd to wrksrc!"
[ -n "$build_wrksrc" ] && cd $build_wrksrc \ if [ -n "$build_wrksrc" ]; then
|| msg_error "can't change cwd to build_wrksrc!" cd $build_wrksrc \
|| msg_error "can't change cwd to build_wrksrc!"
fi
# Run pre_install func. # Run pre_install func.
run_func pre_install || msg_error "pre_install stage failed!" run_func pre_install || msg_error "pre_install stage failed!"