sys-devel/distcc: Disable CHOST rewrites that break i686 cross

Closes: https://bugs.gentoo.org/773652
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny 2021-03-02 18:23:51 +01:00
parent 51d932c944
commit 76151f32fb
No known key found for this signature in database
GPG Key ID: 639ADAE2329E240E
2 changed files with 30 additions and 0 deletions

View File

@ -46,6 +46,8 @@ src_prepare() {
eapply "${FILESDIR}/${P}-py38.patch"
# gcc-10 fix, #707502
eapply "${FILESDIR}/${P}-gcc-10-fix.patch"
# unbreak CHOST prefix, https://bugs.gentoo.org/773652
eapply "${FILESDIR}/${P}-no-rewrite-chost.patch"
eapply_user
# Bugs #120001, #167844 and probably more. See patch for description.

View File

@ -0,0 +1,28 @@
From c2471d4cf3e2ef2556c150d52860b4e8f04e4994 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
Date: Mon, 1 Mar 2021 22:13:36 +0200
Subject: [PATCH] distcc: fix i686 cross compile
[mgorny: disable toolchain prefix rewriting code that workarounds some
Debian invention and breaks everything else]
---
src/compile.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/compile.c b/src/compile.c
index 25df355..e5d655b 100644
--- a/src/compile.c
+++ b/src/compile.c
@@ -572,7 +572,7 @@ static int dcc_gcc_rewrite_fqn(char **argv)
if (!newcmd)
return -ENOMEM;
- if ((t = strstr(target_with_vendor, "-pc-"))) {
+ if (0 && (t = strstr(target_with_vendor, "-pc-"))) {
memcpy(newcmd, target_with_vendor, t - target_with_vendor);
strcat(newcmd, t + strlen("-pc"));
} else
--
2.26.2