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

Accepting request 1113283 from devel:tools:building

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1113283
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/meson?expand=0&rev=99
This commit is contained in:
Dominique Leuenberger 2023-09-27 22:24:22 +00:00 committed by Git OBS Bridge
commit 586067b8c3
3 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
get_llvm_tool_names-llvm17.patch Normal file
View File

@ -0,0 +1,22 @@
From d0b09898c703f6c10ec5a6b2aeace0df2e3570aa Mon Sep 17 00:00:00 2001
From: Christoph Reiter <reiter.christoph@gmail.com>
Date: Sat, 23 Sep 2023 17:21:43 +0200
Subject: [PATCH] get_llvm_tool_names: add llvm 17
this fixes the "frameworks: 15 llvm" tests with llvm 17
---
mesonbuild/environment.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 53cb1206fef..5c7d78b9028 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -157,6 +157,7 @@ def get_llvm_tool_names(tool: str) -> T.List[str]:
# unless it becomes a stable release.
suffixes = [
'', # base (no suffix)
+ '-17', '17',
'-16', '16',
'-15', '15',
'-14', '14',

5
meson.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Sep 23 20:58:26 UTC 2023 - Aaron Puchert <aaronpuchert@alice-dsl.net>
- Port back get_llvm_tool_names-llvm17.patch to accept LLVM 17.
-------------------------------------------------------------------
Tue Aug 8 14:35:16 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>

3
meson.spec
View File

@ -50,6 +50,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 get_llvm_tool_names-llvm17.patch -- Accept LLVM 17.
Patch3: get_llvm_tool_names-llvm17.patch
BuildRequires: %{python_module base >= 3.7}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@ -172,6 +174,7 @@ Vim/NeoVim.
%if !%{with setuptools}
%patch2 -p1
%endif
%patch3 -p1
%if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000
# AddressSanitizer fails here because of ulimit.