From b90ac2b63053d718fb5f2f5f904b9f34a0acb9e4 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 28 Oct 2011 10:47:20 +0200 Subject: [PATCH] xbps-src: helpers/waf run thru python directly (avoids env(1) call). --- xbps-src/helpers/waf.sh | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/xbps-src/helpers/waf.sh b/xbps-src/helpers/waf.sh index dbf72314c8e..57a2e5c1d92 100644 --- a/xbps-src/helpers/waf.sh +++ b/xbps-src/helpers/waf.sh @@ -2,25 +2,16 @@ # This helper is for templates using WAF to build/install. # do_configure() { - if [ -z "$configure_script" ]; then - configure_script="./waf" - fi - ${configure_script} configure --prefix=/usr ${configure_args} + python waf configure --prefix=/usr ${configure_args} } do_build() { - if [ -z "$make_cmd" ]; then - make_cmd="./waf" - fi - ${make_cmd} build ${make_build_args} + python waf build ${make_build_args} } do_install() { - if [ -z "$make_cmd" ]; then - make_cmd="./waf" - fi if [ -z "$make_install_args" ]; then make_install_args="--destdir=$DESTDIR" fi - ${make_cmd} install ${make_install_args} + python waf install ${make_install_args} }