testing/meson
SHA256
3
0
Fork 0
forked from pool/meson
Code Pull Requests Activity

Accepting request 1230120 from devel:tools:building

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1230120
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/meson?expand=0&rev=118
This commit is contained in:
Ana Guerrero 2024-12-12 20:14:20 +00:00 committed by Git OBS Bridge
commit fa61bf25f6
3 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +0,0 @@
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 @@
-------------------------------------------------------------------
Tue Dec 10 14:17:35 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
- Drop meson-testsuite-with-cmake-3.31.patch: the actual fix was
done in CMake 3.31.2.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Dec 6 11:11:56 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org> Fri Dec 6 11:11:56 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

5
meson.spec
View File

@ -51,10 +51,8 @@ Patch0: meson-test-installed-bin.patch
Patch1: extend-test-timeout-on-qemu-builds.patch Patch1: extend-test-timeout-on-qemu-builds.patch
# PATCH-FIX-OPENSUSE meson-distutils.patch -- meson is ring0 and therefor setuptools is not available # PATCH-FIX-OPENSUSE meson-distutils.patch -- meson is ring0 and therefor setuptools is not available
Patch2: meson-distutils.patch 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
# PATCH-FIX-UPSTREAM -- Fix test suite with rust 1.83 # PATCH-FIX-UPSTREAM -- Fix test suite with rust 1.83
Patch4: https://patch-diff.githubusercontent.com/raw/mesonbuild/meson/pull/13935.patch Patch3: https://patch-diff.githubusercontent.com/raw/mesonbuild/meson/pull/13935.patch
BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module base >= 3.7}
BuildRequires: fdupes BuildRequires: fdupes
@ -193,7 +191,6 @@ Vim/NeoVim.
%patch -P 2 -p1 %patch -P 2 -p1
%endif %endif
%patch -P 3 -p1 %patch -P 3 -p1
%patch -P 4 -p1
%if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000 %if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000
# AddressSanitizer fails here because of ulimit. # AddressSanitizer fails here because of ulimit.