From 2d2ca5449fd9c304d0b11bdd3eb6a6ba814a14bb Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 31 Dec 2020 14:23:48 +0100 Subject: [PATCH] Fix build_pyqt function --- bootstrap-carla.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/bootstrap-carla.sh b/bootstrap-carla.sh index ba131ce..76aa945 100755 --- a/bootstrap-carla.sh +++ b/bootstrap-carla.sh @@ -78,11 +78,6 @@ function build_pyqt() { local extraconfrules="${3}" local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" - local python=python3 - - if ! which python3 > /dev/null; then - python=python - fi local EXTRA_CFLAGS2="${EXTRA_CFLAGS}" local EXTRA_CXXFLAGS2="${EXTRA_CXXFLAGS}" @@ -93,10 +88,11 @@ function build_pyqt() { if [ ! -f "${pkgdir}/.stamp_preconfigured" ]; then pushd "${pkgdir}" - ${python} configure.py ${extraconfrules} + python3 configure.py ${extraconfrules} sed -i -e 's/CFLAGS =/CFLAGS +=/' */Makefile sed -i -e 's/CXXFLAGS =/CXXFLAGS +=/' */Makefile sed -i -e 's/LIBS =/LIBS += $(LDFLAGS)/' */Makefile + sed -i -e 's|$(DESTDIR)/usr|$(DESTDIR)$(PREFIX)|g' */Makefile touch .stamp_preconfigured popd fi