From 1739559ebe708c208caeea275702ae3b17aafb5c Mon Sep 17 00:00:00 2001 From: Maxython Date: Mon, 11 Dec 2023 12:30:50 +0300 Subject: [PATCH] termux_step_configure_meson.sh: add native compilation --- scripts/build/configure/termux_step_configure_meson.sh | 2 +- scripts/build/termux_step_setup_variables.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/build/configure/termux_step_configure_meson.sh b/scripts/build/configure/termux_step_configure_meson.sh index 43aa502318cf47..f4604618dbd552 100644 --- a/scripts/build/configure/termux_step_configure_meson.sh +++ b/scripts/build/configure/termux_step_configure_meson.sh @@ -11,7 +11,7 @@ termux_step_configure_meson() { CC=gcc CXX=g++ CFLAGS= CXXFLAGS= CPPFLAGS= LDFLAGS= $TERMUX_MESON \ $TERMUX_PKG_SRCDIR \ $TERMUX_PKG_BUILDDIR \ - --cross-file $TERMUX_MESON_CROSSFILE \ + --$(test "${TERMUX_PKG_MESON_NATIVE}" = "true" && echo "native-file" || echo "cross-file") $TERMUX_MESON_CROSSFILE \ --prefix $TERMUX_PREFIX \ --libdir lib \ --buildtype ${_meson_buildtype} \ diff --git a/scripts/build/termux_step_setup_variables.sh b/scripts/build/termux_step_setup_variables.sh index b5002ef25a9f88..de2e498af94fa8 100644 --- a/scripts/build/termux_step_setup_variables.sh +++ b/scripts/build/termux_step_setup_variables.sh @@ -184,6 +184,7 @@ termux_step_setup_variables() { TERMUX_PKG_PYTHON_COMMON_DEPS="" # python modules to be installed via pip3 or build-pip TERMUX_PYTHON_CROSSENV_PREFIX="$TERMUX_TOPDIR/python-crossenv-prefix-$TERMUX_ARCH" # python modules dependency location (only used in non-devices) TERMUX_PYTHON_HOME=$TERMUX_PREFIX/lib/python${TERMUX_PYTHON_VERSION} # location of python libraries + TERMUX_PKG_MESON_NATIVE=false unset CFLAGS CPPFLAGS LDFLAGS CXXFLAGS unset TERMUX_MESON_ENABLE_SOVERSION # setenv to enable SOVERSION suffix for shared libs built with Meson