From c2aca15d0b49021e605cd98c3be34f003fdf6e6a Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 30 Jul 2023 02:41:59 +0000
Subject: [PATCH] extra/meson to 1.2.0-3

---
 extra/meson/0001-Skip-broken-tests.patch | 20 +++++++++++++++++---
 extra/meson/PKGBUILD                     | 11 +++++++++--
 extra/meson/cross-lib32                  | 18 ++++++++++++++++++
 extra/meson/native-clang                 |  6 ++++++
 4 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 extra/meson/cross-lib32
 create mode 100644 extra/meson/native-clang

diff --git a/extra/meson/0001-Skip-broken-tests.patch b/extra/meson/0001-Skip-broken-tests.patch
index 7d0dd4b9e..34c7a1bc7 100644
--- a/extra/meson/0001-Skip-broken-tests.patch
+++ b/extra/meson/0001-Skip-broken-tests.patch
@@ -4,9 +4,10 @@ Date: Thu, 14 Apr 2022 14:08:15 +0000
 Subject: [PATCH] Skip broken tests
 
 ---
- test cases/frameworks/15 llvm/test.json | 1 -
- unittests/linuxliketests.py             | 2 ++
- 2 files changed, 2 insertions(+), 1 deletion(-)
+ test cases/frameworks/15 llvm/test.json              | 1 -
+ test cases/linuxlike/13 cmake dependency/meson.build | 2 ++
+ unittests/linuxliketests.py                          | 2 ++
+ 3 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/test cases/frameworks/15 llvm/test.json b/test cases/frameworks/15 llvm/test.json
 index 66ecd43552f6..1519155e3405 100644
@@ -20,6 +21,19 @@ index 66ecd43552f6..1519155e3405 100644
          { "val": false }
        ]
      }
+diff --git a/test cases/linuxlike/13 cmake dependency/meson.build b/test cases/linuxlike/13 cmake dependency/meson.build
+index 193ad184b637..e94ba68ac30f 100644
+--- a/test cases/linuxlike/13 cmake dependency/meson.build	
++++ b/test cases/linuxlike/13 cmake dependency/meson.build	
+@@ -6,6 +6,8 @@ if not find_program('cmake', required: false).found()
+   error('MESON_SKIP_TEST cmake binary not available.')
+ endif
+ 
++error('MESON_SKIP_TEST flaky, see https://github.com/mesonbuild/meson/issues/10104')
++
+ # Zlib is probably on all dev machines.
+ 
+ dep = dependency('ZLIB', version : '>=1.2', method : 'cmake')
 diff --git a/unittests/linuxliketests.py b/unittests/linuxliketests.py
 index 373887401f0d..12741c557fbc 100644
 --- a/unittests/linuxliketests.py
diff --git a/extra/meson/PKGBUILD b/extra/meson/PKGBUILD
index 44214bc37..b454f8ce6 100644
--- a/extra/meson/PKGBUILD
+++ b/extra/meson/PKGBUILD
@@ -7,7 +7,7 @@
 
 pkgname=meson
 pkgver=1.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="High productivity build system"
 url="https://mesonbuild.com/"
 arch=(any)
@@ -73,6 +73,8 @@ source=(
   meson-reference-$pkgver.3::https://github.com/mesonbuild/meson/releases/download/$pkgver/meson-reference.3
   meson-reference-$pkgver.json::https://github.com/mesonbuild/meson/releases/download/$pkgver/reference_manual.json
   arch-meson
+  cross-lib32
+  native-clang
   0001-Skip-broken-tests.patch
   0002-Use-C-17-for-protobuf-tests.patch
 )
@@ -81,7 +83,9 @@ b2sums=('a8239c41ab5d20c26c057293dc85e5577eb9e6eef7a39acc67a0b5b1e82b1afae341936
         'eb67d25e967aaeaec9453bf9af6229cbefd6fa75982e3782e703b440359d8042690d1c8a9542773dcf160af03f36a18e3b9ae3426cf566aa3679164317e774f4'
         '9bb2565a8667b71c901aa690b4eb36b64011191cd7a9420c244350d0d9659657347e8a9852945fcc606f8d235af92d18adaf5804ccb60fa1fc285dba79fd1126'
         '211cee61f117fd1d582d7a613a8634f044e9e307791c4154c6da72bccd5f06856801b14bcb26157ee682b5935c48ffd2098a5fabab2232726d7758cf091c07f7'
-        '26f95bfa9ffcc602b8cacc6c6e2dfe2a3a144649e570844a66373fa8a8c2400767d58486579790099bb30f34943209edf958143c31b3e25d76200b6092f9bb3e'
+        '1822a74c73806b1036c72c13a03756a0bceee4684bdf97f775c18d9e21ba524f3544a66ecb1bd3cec826177c4747942c6d48d1e62aec8bee1b75b8108abafbe3'
+        '7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e'
+        'f4e232c858b81ae3839a4d721257ef8fa3a6a960c7aff1369a1caa88f9e8df7adbf4a1839072ebdb43175820ce8faec9ba303adb91c85f57ee28fda8cfdf7260'
         'a60bbc46b1b3d1067716ff912ecd09c09c22460fac27105e591cb77905d4c8ca43e59f3f5a644737d68dd408a77071eb07e65e88731f3673363ba7b57d587071')
 validpgpkeys=(
   19E2D6D9B46D8DAA6288F877C24E631BABB1FE70  # Jussi Pakkanen <jpakkane@gmail.com>
@@ -118,6 +122,9 @@ package() {
   install -Dm644 ../meson-reference-$pkgver.json "$pkgdir/usr/share/doc/$pkgname/reference_manual.json"
 
   install -D ../arch-meson -t "$pkgdir/usr/bin"
+
+  install -Dm644 ../cross-lib32 "$pkgdir/usr/share/meson/cross/lib32"
+  install -Dm644 ../native-clang "$pkgdir/usr/share/meson/native/clang"
 }
 
 # vim:set sw=2 sts=-1 et:
diff --git a/extra/meson/cross-lib32 b/extra/meson/cross-lib32
new file mode 100644
index 000000000..fc4f3027d
--- /dev/null
+++ b/extra/meson/cross-lib32
@@ -0,0 +1,18 @@
+[binaries]
+c = ['gcc', '-m32']
+cpp = ['g++', '-m32']
+rust = ['rustc', '--target', 'i686-pc-linux-gnu']
+pkgconfig = 'i686-pc-linux-gnu-pkg-config'
+llvm-config = 'llvm-config32'
+strip = 'strip'
+
+[built-in options]
+libdir = 'lib32'
+
+[host_machine]
+system = 'linux'
+subsystem = 'linux'
+kernel = 'linux'
+cpu_family = 'x86'
+cpu = 'i686'
+endian = 'little'
diff --git a/extra/meson/native-clang b/extra/meson/native-clang
new file mode 100644
index 000000000..de7aa0b45
--- /dev/null
+++ b/extra/meson/native-clang
@@ -0,0 +1,6 @@
+[binaries]
+c = 'clang'
+cpp = 'clang++'
+c_ld = 'lld'
+cpp_ld = 'lld'
+rust_ld = 'clang'