diff options
| author |   Eli Schwartz <eschwartz93@gmail.com> | 2024-01-16 23:50:26 -0500 |
|---|---|---|
| committer |   Sam James <sam@gentoo.org> | 2024-01-17 05:54:01 +0000 |
| commit | 791e631e0121da91676113928a3e4070453c2449 (patch) | |
| tree | 92722ec5ea19b3d99805634f017c53eead189aa0 | |
| parent | sys-fs/btrfs-progs: Stabilize 6.6.3 arm, #922281 (diff) | |
| download | gentoo-791e631e.tar.gz gentoo-791e631e.tar.bz2 gentoo-791e631e.zip | |
Revert "dev-util/meson-1.3.1: fix for Darwin with native linker again"
This reverts commit b7035fb0da8ffcf1577b68d43f49511adee8237d.
This patch was previously introduced for bug 868516, and hit pushback by
multiple parties that wanted to see this discussed upstream. After some
coaxing and arm-twisting, an upstream issue was finally opened (but no
patch submitted). The patch in ::gentoo went stale, and got dropped.
base-system@ is uninterested in maintaining this out of tree patch given
the situation (and neither am I).
After the ticket was opened upstream, it was retracted by the submitter:
> I decided to fix the problem from out custom version of xtools's end.
Now it's back as a local patch to dev-build/meson, where it's just going
to bitrot another time? No explanation for why this is necessary,
especially if xtools added compatible output. No attempt to submit a PR
to meson. No bug link to cross-reference relevant bugs.
Solve this by reducing the local-patches tech debt and punting on the
issue, pending actual upstreaming. We can revisit backporting a patch if
and when it will constitute a backport of a patch available in upstream
git master.
Bug: https://bugs.gentoo.org/868516
Signed-off-by: Eli Schwartz <eschwartz93@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>
| -rw-r--r-- | dev-build/meson/files/meson-1.3.1-xtools-support.patch | 26 | ||||
| -rw-r--r-- | dev-build/meson/meson-1.3.1.ebuild | 1 |
2 files changed, 0 insertions, 27 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 6e9e670ba8da..000000000000 --- a/dev-build/meson/files/meson-1.3.1-xtools-support.patch +++ /dev/null @@ -1,26 +0,0 @@ -linkers_detect: detect xtools (Apple ld64 derivative) - -xtools is in use on x86_64 and ppc based darwin Prefix installs. Pick -it up as a valid linker. - -Meson is the only thing known at this point to try and figure out what -linker is in use exactly, so instead of changing the linker (xtools), -just teach Meson about xtools. - -Author: Fabian Groffen <grobian@gentoo.org> -Bug: https://bugs.gentoo.org/868516 - ---- a/mesonbuild/linkers/detect.py -+++ b/mesonbuild/linkers/detect.py -@@ -185,6 +185,11 @@ - v = search_version(o) - - linker = linkers.LLVMDynamicLinker(compiler, for_machine, comp_class.LINKER_PREFIX, override, version=v) -+ # detect xtools first, bug #868516 -+ elif 'xtools-' in o.split('\n')[0]: -+ xtools = o.split(' ')[0] -+ v = xtools.split('-')[1] -+ linker = 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: diff --git a/dev-build/meson/meson-1.3.1.ebuild b/dev-build/meson/meson-1.3.1.ebuild index 0f026f75c31e..2498ea56a83a 100644 --- a/dev-build/meson/meson-1.3.1.ebuild +++ b/dev-build/meson/meson-1.3.1.ebuild @@ -54,7 +54,6 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-1.2.1-python-path.patch - "${FILESDIR}"/${PN}-1.3.1-xtools-support.patch # backport fix for hiding compiler warnings (such as Modern C) in vala and cython "${FILESDIR}"/0001-ninja-backend-don-t-hide-all-compiler-warnings-for-t.patch |