pool/meson
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1225964 from devel:tools:building

Browse Source 
- Add meson-testsuite-with-cmake-3.31.patch: Fix test suite run
  against CMake 3.31.

OBS-URL: https://build.opensuse.org/request/show/1225964
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/meson?expand=0&rev=116
This commit is contained in:
Ana Guerrero 2024-11-24 10:03:41 +00:00 committed by Git OBS Bridge
commit a5f4cb39d9
3 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
meson-testsuite-with-cmake-3.31.patch Normal file
View File

@ -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):

6
meson.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Nov 22 09:21:34 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Add meson-testsuite-with-cmake-3.31.patch: Fix test suite run
against CMake 3.31.
-------------------------------------------------------------------
Mon Oct 21 06:52:57 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

3
meson.spec
View File

@ -51,6 +51,8 @@ Patch0: meson-test-installed-bin.patch
Patch1: extend-test-timeout-on-qemu-builds.patch
# PATCH-FIX-OPENSUSE meson-distutils.patch -- meson is ring0 and therefor setuptools is not available
Patch2: meson-distutils.patch
# PATCH-FIX-UPSTREAM meson-testsuite-with-cmake-3.31.patch -- Fix test suite when using CMake 3.31
Patch3: meson-testsuite-with-cmake-3.31.patch
BuildRequires: %{python_module base >= 3.7}
BuildRequires: fdupes
@ -188,6 +190,7 @@ Vim/NeoVim.
%if !%{with setuptools}
%patch -P 2 -p1
%endif
%patch -P 3 -p1
%if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000
# AddressSanitizer fails here because of ulimit.