diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-01-19 02:07:16 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-01-19 02:07:16 +0000 |
| commit | f432b083b2efe1e2aa0a7497bf0ca78eeb483332 (patch) | |
| tree | 868239b43b2429804608eeb9bb649c1ff350f417 /dev-build/meson/files/meson-1.3.1-xtools-support.patch | |
| parent | a4c0eb2444b57e79bce0a088e5936ed71c415e8f (diff) | |
gentoo auto-resync : 19:01:2024 - 02:07:15
Diffstat (limited to 'dev-build/meson/files/meson-1.3.1-xtools-support.patch')
| -rw-r--r-- | dev-build/meson/files/meson-1.3.1-xtools-support.patch | 39 |
1 files changed, 39 insertions, 0 deletions
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 000000000000..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 <grobian@gentoo.org> +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 <grobian@gentoo.org> +Signed-off-by: Eli Schwartz <eschwartz93@gmail.com> +--- + 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 + |