mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-05 12:16:41 +02:00
dev-build/meson: Sync with Gentoo
It's from Gentoo commit 514c214dd60754f84d22b400f1c0c15e4b10080b.
This commit is contained in:
parent
04882fa274
commit
b7dcf283c3
@ -1,41 +0,0 @@
|
||||
https://bugs.gentoo.org/914576
|
||||
https://github.com/mesonbuild/meson/commit/d0b09898c703f6c10ec5a6b2aeace0df2e3570aa
|
||||
https://github.com/mesonbuild/meson/commit/9c74c73bc7107c794e7f9896cc4220e50ad32bba
|
||||
|
||||
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
|
||||
--- 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',
|
||||
|
||||
From 9c74c73bc7107c794e7f9896cc4220e50ad32bba Mon Sep 17 00:00:00 2001
|
||||
From: Christoph Reiter <reiter.christoph@gmail.com>
|
||||
Date: Sat, 23 Sep 2023 14:10:29 +0200
|
||||
Subject: [PATCH] openmp: add 5.1/5.2, fixes openmp with llvm v17
|
||||
|
||||
llvm v17 defaults to 5.1 and without this meson fails to find
|
||||
openmp: 'ERROR: Dependency "openmp" not found, tried system'
|
||||
|
||||
Add 5.2 as well while at it.
|
||||
--- a/mesonbuild/dependencies/misc.py
|
||||
+++ b/mesonbuild/dependencies/misc.py
|
||||
@@ -85,6 +85,8 @@ def __init__(self, name: str, env: 'Environment', kwargs: T.Dict[str, T.Any]):
|
||||
class OpenMPDependency(SystemDependency):
|
||||
# Map date of specification release (which is the macro value) to a version.
|
||||
VERSIONS = {
|
||||
+ '202111': '5.2',
|
||||
+ '202011': '5.1',
|
||||
'201811': '5.0',
|
||||
'201611': '5.0-revision1', # This is supported by ICC 19.x
|
||||
'201511': '4.5',
|
||||
Loading…
x
Reference in New Issue
Block a user