rpm/meson
SHA256
1
0
Fork 0
forked from pool/meson
Code Pull Requests Activity

Accepting request 1157507 from devel:tools:building

Browse Source 
Not yet jumping to 1.4 - need GNOME 46 for that

OBS-URL: https://build.opensuse.org/request/show/1157507
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/meson?expand=0&rev=107
This commit is contained in:
Ana Guerrero 2024-03-13 21:16:02 +00:00 committed by Git OBS Bridge
commit 83c20deb4d
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
get_llvm_tool_names-llvm18.patch Normal file
View File

@ -0,0 +1,14 @@
Similar to commit 67afddbf431140c1ee064bf79a2fa5a95575488e with title
"environment: Add LLVM 18 support to get_llvm_tool_names()", but with
minor version following the upstream versioning change.
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -188,6 +188,7 @@ def get_llvm_tool_names(tool: str) -> T.List[str]:
# unless it becomes a stable release.
suffixes = [
'', # base (no suffix)
+ '-18.1', '181',
'-17', '17',
'-16', '16',
'-15', '15',

5
meson.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Mar 11 22:48:56 UTC 2024 - Aaron Puchert <aaronpuchert@alice-dsl.net>
- Add get_llvm_tool_names-llvm18.patch to accept LLVM 18.1.
-------------------------------------------------------------------
Wed Feb 14 07:42:56 UTC 2024 - ecsos <ecsos@opensuse.org>

5
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-llvm18.patch -- Accept LLVM 18.1.
Patch3: get_llvm_tool_names-llvm18.patch
BuildRequires: %{python_module base >= 3.7}
BuildRequires: fdupes
@ -69,7 +71,7 @@ ExclusiveArch: x86_64
BuildRequires: %{python_module devel}
BuildRequires: bison
%if 0%{?sle_version} >= 150400 && 0%{?sle_version} < 160000
BuildRequires: clang17 >= 15
BuildRequires: clang17
%else
BuildRequires: clang >= 15
%endif
@ -185,6 +187,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.