13935.patch

@@ -0,0 +1,66 @@
+From d082aec6ce0a3dc8ec7b3748a5130634d1f1c098 Mon Sep 17 00:00:00 2001
+From: Paolo Bonzini <pbonzini@redhat.com>
+Date: Wed, 20 Nov 2024 16:19:49 +0100
+Subject: [PATCH] rust: fix computation of library directory
+
+Using a rustup-based toolchain fails the "rust/2 sharedlib" test for me:
+
+./prog: error while loading shared libraries: libstd-211931512faabf29.so: cannot open shared object file: No such file or directory
+
+This happens because recent rustup places the standard library under
+SYSROOT/lib/rustlib/TARGET/lib.  Retrieve the right directory using
+"--print target-libdir".  This also provides a more accurate version
+for rustc installed in /usr.
+
+Before:
+  $ echo $(/usr/bin/rustc --print sysroot)/lib
+  /usr/lib
+
+After:
+  $ /usr/bin/rustc --print target-libdir
+  /usr/lib/rustlib/x86_64-unknown-linux-gnu/lib
+
+While at it, cache the value to avoid repeated process invocation.
+
+Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
+---
+ mesonbuild/backend/ninjabackend.py | 2 +-
+ mesonbuild/compilers/rust.py       | 7 +++++++
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py
+index 05d5320798fd..5716ea29e351 100644
+--- a/mesonbuild/backend/ninjabackend.py
++++ b/mesonbuild/backend/ninjabackend.py
+@@ -2125,7 +2125,7 @@ def _link_library(libname: str, static: bool, bundle: bool = False):
+             # ... but then add rustc's sysroot to account for rustup
+             # installations
+             for rpath_arg in rpath_args:
+-                args += ['-C', 'link-arg=' + rpath_arg + ':' + os.path.join(rustc.get_sysroot(), 'lib')]
++                args += ['-C', 'link-arg=' + rpath_arg + ':' + rustc.get_target_libdir()]
+ 
+         proc_macro_dylib_path = None
+         if getattr(target, 'rust_crate_type', '') == 'proc-macro':
+diff --git a/mesonbuild/compilers/rust.py b/mesonbuild/compilers/rust.py
+index f09911db642c..02ac593842ad 100644
+--- a/mesonbuild/compilers/rust.py
++++ b/mesonbuild/compilers/rust.py
+@@ -142,11 +142,18 @@ def _native_static_libs(self, work_dir: str, source_name: str) -> None:
+     def get_dependency_gen_args(self, outtarget: str, outfile: str) -> T.List[str]:
+         return ['--dep-info', outfile]
+ 
++    @functools.lru_cache(maxsize=None)
+     def get_sysroot(self) -> str:
+         cmd = self.get_exelist(ccache=False) + ['--print', 'sysroot']
+         p, stdo, stde = Popen_safe_logged(cmd)
+         return stdo.split('\n', maxsplit=1)[0]
+ 
++    @functools.lru_cache(maxsize=None)
++    def get_target_libdir(self) -> str:
++        cmd = self.get_exelist(ccache=False) + ['--print', 'target-libdir']
++        p, stdo, stde = Popen_safe_logged(cmd)
++        return stdo.split('\n', maxsplit=1)[0]
++
+     @functools.lru_cache(maxsize=None)
+     def get_crt_static(self) -> bool:
+         cmd = self.get_exelist(ccache=False) + ['--print', 'cfg']

meson-1.4.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1b8aad738a5f6ae64294cc8eaba9a82988c1c420204484ac02ef782e5bba5f49
+size 2235558

meson-1.4.1.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmZYwdYACgkQwk5jG6ux
+/nBx1g/8Ded08Exn9jq6VTJ6z+O5ruR2776YSKpNKB9VO1uA8FSNMsQLvvTFM9Ee
+vLbbOsCP+85JtqGwtHLdFELyWrhIUIX7AljMteyiq1jVqDpbksLny7W38VCtocHd
+8HbWVTqHp9OrlgKW5eCVibPyUJTcvp/Tb4t7/pDcHxaLfFe2do5mR+VmootUOleM
+YxCDpA7aE1H8W0ao6/bpnIzHHyU8aVcan/5vv5pZ8C1eM1IZvrK7rz2Um6lUoP+L
+yj2c07oa+jqvCeWeaYJxy4g0ipiXD4jtCg3mTbhS1YtusqCh3tUJjdrte4kyOpRh
+PoA2H6fci++Y1Fr+dD2DKauOLE72dZhxzIELTOTzHs08UR42kSDPXatCCMD9nqQZ
+tbxCSHoC5kkXcZEazY5e3Oj7GAIMBGjukVG7dBrruhjd7uT2o9dU9yi45gY0c73e
+clY4fgn3KWv3ss9WqdRwHqbgRRNeurVANMlxnLYK/bvBPEYgvlFjWihGDuMAEQ8t
+lNgqpSk50ftuogLyIrqiZwfprpxeZC2/hrNahF/4QeNbHH9CVbJ/YYEmdxg9to9p
+cuXku4AwsTNM+JmQBEVcfmp0lb0ANFuapFcciVw7BCFJNrTorhbL4i9IuGo5Mps/
+gqfhNW791XwZHuCiNSfkLG6PJ0uwVHRHC4a6vrC4fUIPxcWEgiA=
+=jyaR
+-----END PGP SIGNATURE-----

meson-1.5.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f955e09ab0d71ef180ae85df65991d58ed8430323de7d77a37e11c9ea630910b
+size 2265788

meson-1.5.2.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmbtx94ACgkQwk5jG6ux
+/nDr3hAAj8LDWIGQ+WS4zKArZt5TZLakHNf6guLyzkTmmb+4m0Z0dxnnutiFB+2W
+b47wWXkLjhnDR/gVbPhimnXIWbMDMb7D1f2iKxajiGVcVS9MUZ5eRdRLELZwAa7r
+ADNH9zwfijRVOHv8Z/moXvTT+1Pv++BNPpwxiGh7GFuX5M6719iWRVMSOo4AVHvl
+nJyBuN5IAmI0woekyoOSEHaTpC8qDB/epze8bnMbRn1uixHh1ZOZAC+TR7vcJDwA
+fgp7vQQBHHrvE7q5T7807H6fPsoZ5FFai/SErYzvI8mAIapDtSHWIHcgYGa/UXK2
+Fivdh+B23sNUa1brIqNxHnDCFUPuAyT170cgR9OEggSvvK09jlpHEYW4dJ47MWUu
+F1+wLK0CPKqB+s1K0gmpw4uTeZZikw+uK71D3VJ0N40/3MwJBI85PsnGbSDv2H43
+qlJGmXkjRs05glw8B1nPOFhpzrL7y/7RXnBFdnHdR8uwETHD/EX8xgA8X6rt5iT1
+RPWjyioslOY88XHk96lj5kmNTQM/MNt2VqbIlUm/QM0Q1lfiOQYRCMwW7lXPNZau
+hT2tcyEipBGDXAwFtrQcqs7sPY//mbff3zs6mcmwyOSie8lAW7mJg143/d126LF6
+vYgELiDNqK3zOgVTRVzteYj4283Jf9/YQoFaqOiOehyVU4FqFrM=
+=5ie7
+-----END PGP SIGNATURE-----

meson-1.6.0.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmcVUvAACgkQwk5jG6ux
+/nAxlw/9FujH49x68WLJb/vjBBQrA5GOGBy9Qt2iet559auLySqlWNr5PGWDNlRo
+2rvdCC0NfJOQkqgHqDpGE8+f0MxL670AHyDYxfwXb3NxR+bCzxSbr/isYeei0Ejq
+0GlbpuViZH3gC/pWWrkbcdgBbewk8g3CfdWcywUkrSPh5LGv+NFE7thMd5K/+w2h
+ePDS87s2NUxOProX+kTav6yMcS8vnRFUpg6AY/UIODVNbAs/fqy4a53m+kF4C1+1
+z70UGug3x4tRnmPNiUZ9yV0S/HWrrPNWifq/4neB8PNjrRWbzkgsYyuIQkS6sPD2
+z0ZnccTb3l0le/6r+sCJqA/LGPK/hji6uP3YUxPy+FrdCm2Lhq7zVsT0By0VsmcO
+heJeNx83rZDZjY+aTL3KHKTU5H83xK3MCwgbv9rzFytY+AzNrLpKQ9Iv5eUo4jgN
+HMabygqyKY2FQEVCmHPAKyA5PyW/qWNkft2fRuxvEl1f7sf51jqaYlvNyIwolnGB
+eN3uaY99X/FWGgkl4zIIMQDZ6UUlrfYZJwpZ6m9m/0euT7auSBTcxJE+IQz+LTMC
+ysfBpsMblYR0gu5epwBQTY10N6DpfEXEs8SKalWhM5zu0TDfwgmJ4Yrd5sxA0ri4
+wcyy1mjc5n/mHZL91uJKOmXknQzDms6ohWhVYD0ZOPXLvZj56/A=
+=Ga7S
+-----END PGP SIGNATURE-----

meson-1.6.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1eca49eb6c26d58bbee67fd3337d8ef557c0804e30a6d16bfdf269db997464de
+size 2276144

meson-1.6.1.tar.gz.asc

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEGeLW2bRtjapiiPh3wk5jG6ux/nAFAmdgl8IACgkQwk5jG6ux
+/nDxlg/7BnKdVZkD5yV/7FWvLlndEN81X4gHscJ7U7sChs4lJw2L/pRceD5PJn3n
+AGacyubY2yYlbPms6sB/mBe2psG9EebAUrxJ5MKKjW/RPGy+YbIs/VxeSIxfB6dG
+FoOWng5bbVrrgZ/h7hiqaaFEMmZhf7xlfHWRC391VX9gyVMi7cgp5tHiGXrDSQ+K
+vf6Avq/nBdlMQYahc6sBiQGQl1wDaWeE4lW7Wu4kF0dEYci7eVuaVxmq90Br/ZMV
+Je+xYkKbPZuRBUc1RZyBodIb7xqUh+MFk5C5VmfUH0doxKmQLm2A0a3jrUa3E7CG
+JXjRw9yJF9Nx4R5KIs73townKR+QirriuVjcd0dkgrjPcwEpH74ILc29eReuo8JI
+R5/duPUZwiCeEwV/cnIz8hlgGggAiAIwJg4mW8uMJggVe2jG9aajzSTDQi2ssv+r
+57DRDvUE7f0c25//CNX3AvJ9yxT+68WwYaM4nR/Td/oVapDab7beENgF5pOZnhyR
+hbWYb0RFLJiB39QIZXXa+Sz2ZwC5M3zZ17FMBtOnISPguYKVKK8Jrt6uVXg1uJ0O
+ndfrMJqP0hhZ5k+aR/18xBs657KU3jCj97JLdIWdjKHG/QU3lEQLhcWBUEhukZIS
+XsoHvpTNTlDGMNfYmOFZ7V7XMHhNacHTA9gdT49HMtKuz1ol4qk=
+=NKmm
+-----END PGP SIGNATURE-----

meson-distutils.patch

@@ -0,0 +1,41 @@
+Index: b/setup.py
+===================================================================
+--- a/setup.py
++++ b/setup.py
+@@ -20,7 +20,7 @@ if sys.version_info < (3, 7):
+     raise SystemExit('ERROR: Tried to install Meson with an unsupported Python version: \n{}'
+                      '\nMeson requires Python 3.7.0 or greater'.format(sys.version))
+ 
+-from setuptools import setup
++from distutils.core import setup
+ 
+ data_files = []
+ if sys.platform != 'win32':
+@@ -28,4 +28,16 @@ if sys.platform != 'win32':
+     data_files = [('share/man/man1', ['man/meson.1']),
+                   ('share/polkit-1/actions', ['data/com.mesonbuild.install.policy'])]
+ 
+-setup(data_files=data_files,)
++# Since distutils does not understand the find: directive in setup.cfg, and
++# therefore doesn't expand it, we need to do it directly
++import os
++packages=[
++    root.replace('/', '.')
++    for root, dirs, files in os.walk('mesonbuild')
++    if '__init__.py' in files]
++
++setup(
++    packages=packages,
++    package_data={'mesonbuild.dependencies.data': ['mesonbuild/dependencies/data/*.txt']},
++    data_files=data_files,
++)
+Index: b/MANIFEST.in
+===================================================================
+--- a/MANIFEST.in
++++ b/MANIFEST.in
+@@ -17,3 +17,5 @@ include run_unittests.py
+ include run_meson_command_tests.py
+ include run_project_tests.py
+ include meson.py
++
++include mesonbuild/dependencies/data/*.txt

meson-testsuite-with-cmake-3.31.patch

@@ -0,0 +1,14 @@
+diff --git c/mesonbuild/cmake/interpreter.py i/mesonbuild/cmake/interpreter.py
+index fafee86ab..12d7049d2 100644
+--- c/mesonbuild/cmake/interpreter.py
++++ i/mesonbuild/cmake/interpreter.py
+@@ -828,6 +828,7 @@ class CMakeInterpreter:
+ 
+         cmake_args = []
+         cmake_args += cmake_get_generator_args(self.env)
++        cmake_args += ['-DCMAKE_LINK_DEPENDS_USE_LINKER=FALSE']
+         cmake_args += [f'-DCMAKE_INSTALL_PREFIX={self.install_prefix}']
+         cmake_args += extra_cmake_options
+         if not any(arg.startswith('-DCMAKE_BUILD_TYPE=') for arg in cmake_args):
+
+