diff --git a/bootstrap-carla.sh b/bootstrap-carla.sh index d14cdb5..f5d31cd 100755 --- a/bootstrap-carla.sh +++ b/bootstrap-carla.sh @@ -302,11 +302,6 @@ PYQT5_EXTRAFLAGS="--qmake ${PAWPAW_PREFIX}/bin/qmake --sip ${PAWPAW_PREFIX}/bin/ download PyQt5${PYQT5_SUFFIX} "${PYQT5_VERSION}" "${PYQT5_DOWNLOAD_URL}" build_pyqt PyQt5${PYQT5_SUFFIX} "${PYQT5_VERSION}" "${PYQT5_EXTRAFLAGS} --concatenate --confirm-license -c" -# TODO: finish this -if [ "${WIN32}" -eq 1 ]; then - exit 0 -fi - # --------------------------------------------------------------------------------------------------------------------- # cython (optional) @@ -318,9 +313,26 @@ fi # --------------------------------------------------------------------------------------------------------------------- # pyliblo +export EXTRA_CFLAGS="$(${PAWPAW_PREFIX}/bin/python3-config --cflags | awk 'sub("-ne","")')" +export EXTRA_CFLAGS+=" $(pkg-config --cflags liblo)" + +export EXTRA_LDFLAGS="-shared -L/home/falktx/PawPawBuilds/targets/win64/bin $(${PAWPAW_PREFIX}/bin/python3-config --ldflags | awk 'sub("-ne","")' | awk 'sub("/lib -lpython3.8","/lib -Wl,-Bdynamic -lpython3.8")')" +export EXTRA_LDFLAGS+=" -Wl,-Bstatic $(pkg-config --libs liblo)" + +# export LINK="${TARGET_CXX}" +# export LINKER="${TARGET_CXX}" +export LDSHARED="${TARGET_CXX}" + +# export PYTHONPATH="/home/falktx/PawPawBuilds/targets/win64/lib/python3.8" + download pyliblo "${PYLIBLO_VERSION}" "http://das.nasophon.de/download" build_python pyliblo "${PYLIBLO_VERSION}" +# TODO: finish this +if [ "${WIN32}" -eq 1 ]; then + exit 0 +fi + # --------------------------------------------------------------------------------------------------------------------- # setuptools_scm (optional) diff --git a/setup/functions.sh b/setup/functions.sh index d29d873..3470625 100644 --- a/setup/functions.sh +++ b/setup/functions.sh @@ -375,11 +375,11 @@ function build_python() { local pkgdir="${PAWPAW_BUILDDIR}/${name}-${version}" local python=python3 - if [ "${CROSS_COMPILING}" -eq 1 ]; then - python="${EXE_WRAPPER} ${PAWPAW_PREFIX}/bin/python3${APP_EXT}" - elif [ ! -e "${PAWPAW_PREFIX}/bin/python3" ] && ! which python3 > /dev/null; then - python=python - fi +# if [ "${CROSS_COMPILING}" -eq 1 ]; then +# python="${EXE_WRAPPER} ${PAWPAW_PREFIX}/bin/python3${APP_EXT}" +# elif [ ! -e "${PAWPAW_PREFIX}/bin/python3" ] && ! which python3 > /dev/null; then + python=python3.8 +# fi _prebuild "${name}" "${pkgdir}" @@ -392,20 +392,21 @@ function build_python() { export CXXFLAGS="$(echo ${CXXFLAGS} | sed -e 's/-fvisibility-inlines-hidden//')" export CXXFLAGS="$(echo ${CXXFLAGS} | sed -e 's/-fdata-sections -ffunction-sections//')" export LDFLAGS="$(echo ${LDFLAGS} | sed -e 's/-Wl,-dead_strip -Wl,-dead_strip_dylibs//')" + export LDFLAGS="$(echo ${LDFLAGS} | sed -e 's/-Wl,--strip-all//')" export LDFLAGS="$(echo ${LDFLAGS} | sed -e 's/-fdata-sections -ffunction-sections//')" touch "${pkgdir}/.stamp_configured" if [ ! -f "${pkgdir}/.stamp_built" ]; then pushd "${pkgdir}" - ${python} setup.py build ${extraconfrules} + ${python} setup.py build ${extraconfrules} --verbose touch .stamp_built popd fi if [ ! -f "${pkgdir}/.stamp_installed" ]; then pushd "${pkgdir}" - ${python} setup.py install --prefix="${PAWPAW_PREFIX}" ${extraconfrules} + ${python} setup.py install --prefix="${PAWPAW_PREFIX}" ${extraconfrules} --verbose touch .stamp_installed popd fi