[packages/meson] revert the revert and allow running arm32 on aarch64 again; rel 2

[atler]

commit 5eea46a5bfa9616f6fc8329a9bc527af7a77bd4d
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Aug 7 15:17:15 2024 +0200

    revert the revert and allow running arm32 on aarch64 again; rel 2
    
    see https://github.com/mesonbuild/meson/pull/13427
    
    if your aarch64 platform does not run arm32 binaries just don't try to
    build them in the first place or use cross compilation config for god's sake

 allow-arm-on-arm64.patch | 29 +++++++++++++++++++++++++++++
 meson.spec               |  4 +++-
 2 files changed, 32 insertions(+), 1 deletion(-)
---
diff --git a/meson.spec b/meson.spec
index 342f6ca..38a5970 100644
--- a/meson.spec
+++ b/meson.spec
@@ -2,7 +2,7 @@ Summary:	High productivity build system
 Summary(pl.UTF-8):	System budowania o dużej produktywności
 Name:		meson
 Version:	1.5.1
-Release:	1
+Release:	2
 License:	Apache v2.0
 Group:		Development/Tools
 #Source0Download: https://github.com/mesonbuild/meson/releases/
@@ -10,6 +10,7 @@ Source0:	https://github.com/mesonbuild/meson/releases/download/%{version}/%{name
 # Source0-md5:	c4f2b3e5ea632685f61ba1b833c4905c
 Patch0:		%{name}-gtkdocdir.patch
 Patch1:		rust-proc-macro-filter-out-target.patch
+Patch2:		allow-arm-on-arm64.patch
 URL:		https://mesonbuild.com/
 BuildRequires:	ninja >= 1.8.2
 BuildRequires:	python3 >= 1:3.7
@@ -56,6 +57,7 @@ Mesona.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1 -R
 
 %{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' \
 	meson.py
diff --git a/allow-arm-on-arm64.patch b/allow-arm-on-arm64.patch
new file mode 100644
index 0000000..011de41
--- /dev/null
+++ b/allow-arm-on-arm64.patch
@@ -0,0 +1,29 @@
+From ec027fe1161e011c7bcb43c50ba34b8405839708 Mon Sep 17 00:00:00 2001
+From: Alyssa Ross <hi at alyssa.is>
+Date: Sun, 14 Jul 2024 17:39:30 +0200
+Subject: [PATCH] Revert "Support armel/armhf builds on native arm64 hosts."
+
+This reverts commit cc201a539674babf46f726859587afb5ed6a6867.
+
+It's true that some aarch64 CPUs can run 32-bit ARM code, but some
+(especially high-end ones, those most likely to be running builds)
+cannot.  It's better to assume that they can't, so builds don't
+unnecessarily fail due to attempting to run a sanity check executable.
+---
+ mesonbuild/environment.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
+index be40dbcfd4be..f71bf219cf64 100644
+--- a/mesonbuild/environment.py
++++ b/mesonbuild/environment.py
+@@ -512,8 +512,7 @@ def machine_info_can_run(machine_info: MachineInfo):
+     return \
+         (machine_info.cpu_family == true_build_cpu_family) or \
+         ((true_build_cpu_family == 'x86_64') and (machine_info.cpu_family == 'x86')) or \
+-        ((true_build_cpu_family == 'mips64') and (machine_info.cpu_family == 'mips')) or \
+-        ((true_build_cpu_family == 'aarch64') and (machine_info.cpu_family == 'arm'))
++        ((true_build_cpu_family == 'mips64') and (machine_info.cpu_family == 'mips'))
+ 
+ class Environment:
+     private_dir = 'meson-private'
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/meson.git/commitdiff/5eea46a5bfa9616f6fc8329a9bc527af7a77bd4d