Browse Source

Fix waf builds for macos without python3

tags/v1.0
falkTX 4 years ago
parent
commit
8ce241030f
1 changed files with 8 additions and 3 deletions
  1. +8
    -3
      setup/functions.sh

+ 8
- 3
setup/functions.sh View File

@@ -303,26 +303,31 @@ function build_waf() {
local extraconfrules="${3}" local extraconfrules="${3}"


local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}"
local python=python3

if ! which python3; then
python=python
fi


_prebuild "${name}" "${pkgdir}" _prebuild "${name}" "${pkgdir}"


if [ ! -f "${pkgdir}/.stamp_configured" ]; then if [ ! -f "${pkgdir}/.stamp_configured" ]; then
pushd "${pkgdir}" pushd "${pkgdir}"
./waf configure --prefix="${PAWPAW_PREFIX}" ${extraconfrules}
${python} waf configure --prefix="${PAWPAW_PREFIX}" ${extraconfrules}
touch .stamp_configured touch .stamp_configured
popd popd
fi fi


if [ ! -f "${pkgdir}/.stamp_built" ]; then if [ ! -f "${pkgdir}/.stamp_built" ]; then
pushd "${pkgdir}" pushd "${pkgdir}"
./waf build
${python} waf build
touch .stamp_built touch .stamp_built
popd popd
fi fi


if [ ! -f "${pkgdir}/.stamp_installed" ]; then if [ ! -f "${pkgdir}/.stamp_installed" ]; then
pushd "${pkgdir}" pushd "${pkgdir}"
./waf install
${python} waf install
touch .stamp_installed touch .stamp_installed
popd popd
fi fi


Loading…
Cancel
Save