From 8d70c35a3d216f0696aa873244154859e1e11e4c Mon Sep 17 00:00:00 2001 From: SupervisedThinking Date: Tue, 23 Nov 2021 19:17:59 +0100 Subject: [PATCH 1/3] scripts/build: load meson host conf as native file --- scripts/build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/build b/scripts/build index 4ec0891c94..2fc8a94ddf 100755 --- a/scripts/build +++ b/scripts/build @@ -264,8 +264,8 @@ else ;; "meson:host") create_meson_conf_host ${TARGET} ${MESON_CONF} - echo "Executing (host): meson ${HOST_MESON_OPTS} --cross-file=${MESON_CONF} ${PKG_MESON_OPTS_HOST} ${PKG_MESON_SCRIPT%/*}" | tr -s " " - meson ${HOST_MESON_OPTS} --cross-file=${MESON_CONF} ${PKG_MESON_OPTS_HOST} ${PKG_MESON_SCRIPT%/*} + echo "Executing (host): meson ${HOST_MESON_OPTS} --native-file=${MESON_CONF} ${PKG_MESON_OPTS_HOST} ${PKG_MESON_SCRIPT%/*}" | tr -s " " + meson ${HOST_MESON_OPTS} --native-file=${MESON_CONF} ${PKG_MESON_OPTS_HOST} ${PKG_MESON_SCRIPT%/*} ;; "meson:init") create_meson_conf_target ${TARGET} ${MESON_CONF} @@ -274,8 +274,8 @@ else ;; "meson:bootstrap") create_meson_conf_host ${TARGET} ${MESON_CONF} - echo "Executing (bootstrap): meson ${BOOTSTRAP_MESON_OPTS} --cross-file=${MESON_CONF} ${PKG_MESON_OPTS_BOOTSTRAP} ${PKG_MESON_SCRIPT%/*}" | tr -s " " - meson ${BOOTSTRAP_MESON_OPTS} --cross-file=${MESON_CONF} ${PKG_MESON_OPTS_BOOTSTRAP} ${PKG_MESON_SCRIPT%/*} + echo "Executing (bootstrap): meson ${BOOTSTRAP_MESON_OPTS} ----native-file=${MESON_CONF} ${PKG_MESON_OPTS_BOOTSTRAP} ${PKG_MESON_SCRIPT%/*}" | tr -s " " + meson ${BOOTSTRAP_MESON_OPTS} --native-file=${MESON_CONF} ${PKG_MESON_OPTS_BOOTSTRAP} ${PKG_MESON_SCRIPT%/*} ;; # cmake builds with ninja From ec1d61ce43695f3cd5e6fcf536ecff7f56806c16 Mon Sep 17 00:00:00 2001 From: SupervisedThinking Date: Tue, 23 Nov 2021 19:18:39 +0100 Subject: [PATCH 2/3] config/optimize: add MACHINE_HARDWARE_CPU for meson conf --- config/optimize | 1 + 1 file changed, 1 insertion(+) diff --git a/config/optimize b/config/optimize index ca39331a61..5256dc7b58 100644 --- a/config/optimize +++ b/config/optimize @@ -65,6 +65,7 @@ if [ -z "$HOST_LIBDIR" ]; then HOST_LIBDIR="$TOOLCHAIN/lib" # ubuntu/debian specific "multiarch support" + export MACHINE_HARDWARE_CPU="$(uname -p)" export MACHINE_HARDWARE_NAME="$(uname -m)" export MACHINE_HARDWARE_PLATFORM="$(uname -i)" FAMILY_TRIPLET=$($LOCAL_CC -print-multiarch) From 6f2ccfae7e0cdd2add1896ab2775e087cc80d2a8 Mon Sep 17 00:00:00 2001 From: SupervisedThinking Date: Tue, 23 Nov 2021 19:19:33 +0100 Subject: [PATCH 3/3] config/functions: add build_machine to meson conf --- config/functions | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/config/functions b/config/functions index 708aa9593f..d597bdb2dc 100644 --- a/config/functions +++ b/config/functions @@ -485,10 +485,16 @@ pkgconfig = '$PKG_CONFIG' llvm-config = '$TOOLCHAIN/bin/llvm-config-host' libgcrypt-config = '$SYSROOT_PREFIX/usr/bin/libgcrypt-config' +[build_machine] +system = 'linux' +cpu_family = '${MACHINE_HARDWARE_NAME}' +cpu = '${MACHINE_HARDWARE_CPU}' +endian = 'little' + [host_machine] system = 'linux' -cpu_family = '$TARGET_ARCH' -cpu = '$TARGET_SUBARCH' +cpu_family = '${MACHINE_HARDWARE_NAME}' +cpu = '${MACHINE_HARDWARE_CPU}' endian = 'little' [built-in options] @@ -517,6 +523,12 @@ pkgconfig = '$PKG_CONFIG' llvm-config = '$TOOLCHAIN/bin/llvm-config-host' libgcrypt-config = '$SYSROOT_PREFIX/usr/bin/libgcrypt-config' +[build_machine] +system = 'linux' +cpu_family = '${MACHINE_HARDWARE_NAME}' +cpu = '${MACHINE_HARDWARE_CPU}' +endian = 'little' + [host_machine] system = 'linux' cpu_family = '$TARGET_ARCH'