From 210049e5ccb0ec5e0c303519f676e4e223058578 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 30 Jun 2022 16:26:30 +0200 Subject: [PATCH 1/3] config/functions: set build cpu in meson.conf to MACHINE_HARDWARE_NAME This is also what meson does by default on Linux as Linux doesn't support reporting CPU type. Signed-off-by: Matthias Reichl --- config/functions | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/functions b/config/functions index 631ee2cf0a..295f1931eb 100644 --- a/config/functions +++ b/config/functions @@ -511,13 +511,13 @@ libgcrypt-config = '$SYSROOT_PREFIX/usr/bin/libgcrypt-config' [build_machine] system = 'linux' cpu_family = '${MACHINE_HARDWARE_NAME}' -cpu = '${MACHINE_HARDWARE_CPU}' +cpu = '${MACHINE_HARDWARE_NAME}' endian = 'little' [host_machine] system = 'linux' cpu_family = '${MACHINE_HARDWARE_NAME}' -cpu = '${MACHINE_HARDWARE_CPU}' +cpu = '${MACHINE_HARDWARE_NAME}' endian = 'little' [built-in options] @@ -549,7 +549,7 @@ libgcrypt-config = '$SYSROOT_PREFIX/usr/bin/libgcrypt-config' [build_machine] system = 'linux' cpu_family = '${MACHINE_HARDWARE_NAME}' -cpu = '${MACHINE_HARDWARE_CPU}' +cpu = '${MACHINE_HARDWARE_NAME}' endian = 'little' [host_machine] From 27c6321afe11fbc15bda088d6a29aad90cac8972 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 30 Jun 2022 16:29:09 +0200 Subject: [PATCH 2/3] rust: use MACHINE_HARDWARE_NAME instead of MACHINE_HARDWARE_CPU Signed-off-by: Matthias Reichl --- config/functions | 2 +- packages/rust/cargo-snapshot/package.mk | 2 +- packages/rust/rust-std-snapshot/package.mk | 2 +- packages/rust/rustc-snapshot/package.mk | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/functions b/config/functions index 295f1931eb..0fed513143 100644 --- a/config/functions +++ b/config/functions @@ -475,7 +475,7 @@ setup_toolchain() { export _python_exec_prefix=/ # rust - case "${MACHINE_HARDWARE_CPU}" in + case "${MACHINE_HARDWARE_NAME}" in "arm") RUST_HOST="arm-unknown-linux-gnueabihf" ;; diff --git a/packages/rust/cargo-snapshot/package.mk b/packages/rust/cargo-snapshot/package.mk index b3a0303168..e010bab6e8 100644 --- a/packages/rust/cargo-snapshot/package.mk +++ b/packages/rust/cargo-snapshot/package.mk @@ -6,6 +6,6 @@ PKG_VERSION="$(get_pkg_version rust)" PKG_SHA256="9461727d754f865ef2a87479d40bbe4c5176f80963b7c50b7797bc8940d7a0a0" PKG_LICENSE="MIT" PKG_SITE="https://www.rust-lang.org" -PKG_URL="https://static.rust-lang.org/dist/cargo-${PKG_VERSION}-${MACHINE_HARDWARE_CPU}-unknown-linux-gnu.tar.xz" +PKG_URL="https://static.rust-lang.org/dist/cargo-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz" PKG_LONGDESC="cargo bootstrap package" PKG_TOOLCHAIN="manual" diff --git a/packages/rust/rust-std-snapshot/package.mk b/packages/rust/rust-std-snapshot/package.mk index e0d80fcdd5..e3d67b03c3 100644 --- a/packages/rust/rust-std-snapshot/package.mk +++ b/packages/rust/rust-std-snapshot/package.mk @@ -6,6 +6,6 @@ PKG_VERSION="$(get_pkg_version rust)" PKG_SHA256="270b07aa5f2de52255a117e1e587138d77375ce0d09a1d7fead085f29b3977e9" PKG_LICENSE="MIT" PKG_SITE="https://www.rust-lang.org" -PKG_URL="https://static.rust-lang.org/dist/rust-std-${PKG_VERSION}-${MACHINE_HARDWARE_CPU}-unknown-linux-gnu.tar.xz" +PKG_URL="https://static.rust-lang.org/dist/rust-std-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz" PKG_LONGDESC="rust std library bootstrap package" PKG_TOOLCHAIN="manual" diff --git a/packages/rust/rustc-snapshot/package.mk b/packages/rust/rustc-snapshot/package.mk index b166dcb3f3..fdb75cd8a5 100644 --- a/packages/rust/rustc-snapshot/package.mk +++ b/packages/rust/rustc-snapshot/package.mk @@ -6,6 +6,6 @@ PKG_VERSION="$(get_pkg_version rust)" PKG_SHA256="21c4613f389ed130fbaaf88f1e984319f72b5fc10734569a5ba19e22ebb03abd" PKG_LICENSE="MIT" PKG_SITE="https://www.rust-lang.org" -PKG_URL="https://static.rust-lang.org/dist/rustc-${PKG_VERSION}-${MACHINE_HARDWARE_CPU}-unknown-linux-gnu.tar.xz" +PKG_URL="https://static.rust-lang.org/dist/rustc-${PKG_VERSION}-${MACHINE_HARDWARE_NAME}-unknown-linux-gnu.tar.xz" PKG_LONGDESC="rustc bootstrap compiler" PKG_TOOLCHAIN="manual" From bb7c110320ea5ccf975f59fd7fff70c317b1d1d6 Mon Sep 17 00:00:00 2001 From: Matthias Reichl Date: Thu, 30 Jun 2022 16:30:38 +0200 Subject: [PATCH 3/3] config/optimize: drop unused MACHINE_HARDWARE_CPU/PLATFORM variables uname options -p and -i are non portable and return "unknown" on Linux with GNU coreutils as there's no OS support for it. Note: some distributions like Fedora or Ubunto patch coreutils so that uname -p (more or less) returns the machine name (uname -m output). But that should not be used and fails on distributions like Debian that don't add that patch. Signed-off-by: Matthias Reichl --- config/optimize | 2 -- 1 file changed, 2 deletions(-) diff --git a/config/optimize b/config/optimize index 6122fc54a9..fe5f8ec625 100644 --- a/config/optimize +++ b/config/optimize @@ -65,9 +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) if [ -n "$FAMILY_TRIPLET" ]; then if [ -d /lib/$FAMILY_TRIPLET ]; then