diff options
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 | 36 |
1 files changed, 0 insertions, 36 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 deleted file mode 100644 index 6d766afc10..0000000000 --- a/dev-build/meson/files/meson-1.3.1-xtools-support.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2725b6d7a35b3bbbadd65c0accd71a66ac70549d 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. - -Author: Fabian Groffen <grobian@gentoo.org> -Bug: https://bugs.gentoo.org/868516 -Bug: https://github.com/mesonbuild/meson/issues/10805 -Signed-off-by: Fabian Groffen <grobian@gentoo.org> ---- - mesonbuild/linkers/detect.py | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/mesonbuild/linkers/detect.py b/mesonbuild/linkers/detect.py -index 918f2e63426b..1bce413f4f52 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: |