[gentoo-commits] repo/gentoo:master commit in: dev-build/meson/files/
commit: 514c214dd60754f84d22b400f1c0c15e4b10080b
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Mon Mar 4 18:17:55 2024 +
Commit: Petr Vaněk gentoo org>
CommitDate: Tue Mar 5 09:17:02 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=514c214d
dev-build/meson: remove unused patch
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Petr Vaněk gentoo.org>
dev-build/meson/files/meson-1.2.1-llvm-17.patch | 41 -
1 file changed, 41 deletions(-)
diff --git a/dev-build/meson/files/meson-1.2.1-llvm-17.patch
b/dev-build/meson/files/meson-1.2.1-llvm-17.patch
deleted file mode 100644
index ceee1dcd292b..
--- a/dev-build/meson/files/meson-1.2.1-llvm-17.patch
+++ /dev/null
@@ -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
-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
-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',
[gentoo-commits] repo/gentoo:master commit in: dev-build/meson/files/, dev-build/meson/
commit: e538accf3e4cb33b8537290de31ce4fc503047c8
Author: Eli Schwartz gmail com>
AuthorDate: Thu Jan 18 20:26:51 2024 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 18 20:43:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e538accf
dev-build/meson: backport macos Prefix fix
Followup to commit 791e631e0121da91676113928a3e4070453c2449. The patch
has been integrated upstream and will be backported to meson 1.3.2; the
issues with including it here have been resolved, so bring it back.
Closes: https://bugs.gentoo.org/868516
Signed-off-by: Eli Schwartz gmail.com>
Signed-off-by: Sam James gentoo.org>
.../meson/files/meson-1.3.1-xtools-support.patch | 39 ++
.../{meson-1.3.1.ebuild => meson-1.3.1-r1.ebuild} | 3 ++
2 files changed, 42 insertions(+)
diff --git a/dev-build/meson/files/meson-1.3.1-xtools-support.patch
b/dev-build/meson/files/meson-1.3.1-xtools-support.patch
new file mode 100644
index ..dfb9b3f6be68
--- /dev/null
+++ b/dev-build/meson/files/meson-1.3.1-xtools-support.patch
@@ -0,0 +1,39 @@
+From 33527630f1bd0e51093044016557cb44e7bb6547 Mon Sep 17 00:00:00 2001
+From: Fabian Groffen
+Date: Wed, 17 Jan 2024 17:04:45 +0100
+Subject: [PATCH] linkers_detect: detect xtools (Apple ld64 derivative)
+
+xtools is in use on Gentoo Prefix x86_64 and ppc based Darwin installs.
+Pick it up as a valid linker.
+
+Since xtools is answering with a version to --version, as opposed to
+ld64, detection of xtools in the ld64 handling block is not possible,
+since --version already succeeded.
+
+Bug: https://bugs.gentoo.org/868516
+Bug: https://github.com/mesonbuild/meson/issues/10805
+Signed-off-by: Fabian Groffen
+Signed-off-by: Eli Schwartz
+---
+ mesonbuild/linkers/detect.py | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/mesonbuild/linkers/detect.py b/mesonbuild/linkers/detect.py
+index 918f2e634..1bce413f4 100644
+--- a/mesonbuild/linkers/detect.py
b/mesonbuild/linkers/detect.py
+@@ -174,6 +174,11 @@ def guess_nix_linker(env: 'Environment', compiler:
T.List[str], comp_class: T.Ty
+ v = search_version(o)
+
+ linker = linkers.LLVMDynamicLinker(compiler, for_machine,
comp_class.LINKER_PREFIX, override, version=v)
++# detect xtools first, bug #10805
++elif 'xtools-' in o.split('\n', maxsplit=1)[0]:
++xtools = o.split(' ', maxsplit=1)[0]
++v = xtools.split('-', maxsplit=2)[1]
++linker = linkers.AppleDynamicLinker(compiler, for_machine,
comp_class.LINKER_PREFIX, override, version=v)
+ # First might be apple clang, second is for real gcc, the third is icc.
+ # Note that "ld: unknown option: " sometimes instead is "ld: unknown
options:".
+ elif e.endswith('(use -v to see invocation)\n') or 'macosx_version' in e
or 'ld: unknown option' in e:
+--
+2.43.0
+
diff --git a/dev-build/meson/meson-1.3.1.ebuild
b/dev-build/meson/meson-1.3.1-r1.ebuild
similarity index 96%
rename from dev-build/meson/meson-1.3.1.ebuild
rename to dev-build/meson/meson-1.3.1-r1.ebuild
index 2498ea56a83a..6a86fb79dedb 100644
--- a/dev-build/meson/meson-1.3.1.ebuild
+++ b/dev-build/meson/meson-1.3.1-r1.ebuild
@@ -60,6 +60,9 @@ PATCHES=(
# backport revert for broken rpath changes:
https://github.com/mesonbuild/meson/pull/12672
"${FILESDIR}"/0001-Revert-clike-Deduplicate-rpath-linker-flags.patch
+
+ # backport macos Prefix fix:
https://github.com/mesonbuild/meson/pull/12747
+ "${FILESDIR}"/meson-1.3.1-xtools-support.patch
)
python_prepare_all() {
