From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp0.migadu.com ([2001:41d0:303:e224::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms13.migadu.com with LMTPS
	id iMJ4N73mQme7DAAAqHPOHw:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 24 Nov 2024 08:41:34 +0000
Received: from aspmx1.migadu.com ([2001:41d0:303:e224::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp0.migadu.com with LMTPS
	id iMJ4N73mQme7DAAAqHPOHw
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 24 Nov 2024 09:41:34 +0100
X-Envelope-To: larch@yhetil.org
Authentication-Results: aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="pdcwC/UJ";
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=OmxUhQcy;
	dmarc=pass (policy=none) header.from=gnu.org;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"
ARC-Seal: i=1; s=key1; d=yhetil.org; t=1732437693; a=rsa-sha256; cv=none;
	b=rCf/+OBAKTN8SUmRMfKwn7xz5HGwE3mtGxF8EVarl9NxvTVDjAL85A1DQ7G08vMFEZ9D3L
	brnOpHGhyrQyZPjQeEJFSk3mNQYryy5jfMdj3SM+V2KCUBFZgnq27iOj1282Fso0PBrg5P
	yiDcgUJyGeQ5SBJFyyWoojuSOHLBFJr8Ck4qQ8OEcartTDAtbinyO4b1SMlej8EeKZl4Kd
	vtmON/H5B3UsiDgLwfk5EYijIjMmtdbjAb/tUOjpkqWeWvHQGRcmfGtG5P3tkT/PKaopnx
	2wZt+5MXqSPckCAQG63YFxoL0vJ6hQe3bSDWoG1Vg7BrOarLSA9zfqzi3fdYVg==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="pdcwC/UJ";
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=OmxUhQcy;
	dmarc=pass (policy=none) header.from=gnu.org;
	spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org;
	s=key1; t=1732437693;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:cc:mime-version:mime-version:
	 content-transfer-encoding:content-transfer-encoding:resent-cc:
	 resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to:
	 references:references:list-id:list-help:list-unsubscribe:
	 list-subscribe:list-post:dkim-signature;
	bh=5htvk33j+nNdoI2yUfgG7cRsdw9VkL0Vki8PiZfmNFk=;
	b=nl3FORlvHh62PjJF9UEpmkezpRDFxjCXS8lREihPzHyFxdU1+gNhimxZ6mPc4gLkjZn4l6
	aEgr/mzjd9M+/uD+BNBqijYZKaSflUhQ8fSTvKqZ0aYfiJG14HWAg84JKG61qAvJaZQV8S
	/C3okQ2EcdtQ8DT0ttuokzIDtq0RxudMkW8b+qAtENR0rwxwxtRyLGLsmvDuCq/wCpRstL
	Aswryys9wMCwjXW58ebPBIzVVKIWNEaj7W0NVl/zVeNtHaHIa+p9OjxMcwNFLLn2iEn9Lh
	/F8quIrlwnpBloYYbDoEKaNFoNvjX539MpZqSjlEWy0cWlIDG5x31wHBV9CGCg==
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by aspmx1.migadu.com (Postfix) with ESMTPS id AAEE6512C
	for <larch@yhetil.org>; Sun, 24 Nov 2024 09:41:33 +0100 (CET)
Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <guix-patches-bounces@gnu.org>)
	id 1tF7WY-0002VD-8N; Sun, 24 Nov 2024 02:59:18 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tF7WJ-00026L-CF
 for guix-patches@gnu.org; Sun, 24 Nov 2024 02:59:04 -0500
Received: from debbugs.gnu.org ([2001:470:142:5::43])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tF7WJ-0002iL-2j; Sun, 24 Nov 2024 02:59:03 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
 d=debbugs.gnu.org; s=debbugs-gnu-org; 
 h=MIME-Version:References:In-Reply-To:Date:From:To:Subject;
 bh=5htvk33j+nNdoI2yUfgG7cRsdw9VkL0Vki8PiZfmNFk=; 
 b=pdcwC/UJk8JqpgsLTW6W9ODo4zZExWK3nVrBwgXKGVs44hJrmBeetNZ4KsByKZJR1n3fhQD7t36N7wMkzBS2rL5gHLWUHyuiLJYApfkl3e/1PY1ay9wX9xsbK/h2dHTBDwks5xUG5xpgK6x2GwOjDKWQpkydpV6eWcd/8IiVvq7cb3Vq/YX5NQ8Aa4+IzSOtfS3SYh/V+7wgzIo6idcdIo3vDjtsuZ2e0ycTXWivkMYQjoAS+TEtJb1ee1wmEVtL7imcqURzu3yzxL5edWaiJvxWzjma1qufzvm0ncQEM5QLliUkr7c9kZqXh0XlenRA7QVPsNIsHjAOXjB6nA9TCw==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1tF7WI-0004sa-T8; Sun, 24 Nov 2024 02:59:02 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#74290] [PATCH v4 57/58] gnu: commencement: gcc-boot0: Support
 the 64bit Hurd.
Resent-From: Janneke Nieuwenhuizen <janneke@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: andreas@enge.fr, efraim@flashner.co.il, ekaitz@elenq.tech,
 ludo@gnu.org, guix-patches@gnu.org
Resent-Date: Sun, 24 Nov 2024 07:59:02 +0000
Resent-Message-ID: <handler.74290.B74290.173243513118717@debbugs.gnu.org>
Resent-Sender: help-debbugs@gnu.org
X-GNU-PR-Message: followup 74290
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 74290@debbugs.gnu.org
Cc: Andreas Enge <andreas@enge.fr>, Efraim Flashner <efraim@flashner.co.il>,
 Ekaitz Zarraga <ekaitz@elenq.tech>,
 Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
X-Debbugs-Original-Xcc: Andreas Enge <andreas@enge.fr>,
 Efraim Flashner <efraim@flashner.co.il>, Ekaitz Zarraga <ekaitz@elenq.tech>,
 Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.173243513118717
 (code B ref 74290); Sun, 24 Nov 2024 07:59:02 +0000
Received: (at 74290) by debbugs.gnu.org; 24 Nov 2024 07:58:51 +0000
Received: from localhost ([127.0.0.1]:60954 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tF7W7-0004ri-68
 for submit@debbugs.gnu.org; Sun, 24 Nov 2024 02:58:51 -0500
Received: from eggs.gnu.org ([209.51.188.92]:39176)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <janneke@gnu.org>) id 1tF7UL-0004e4-Eo
 for 74290@debbugs.gnu.org; Sun, 24 Nov 2024 02:57:01 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <janneke@gnu.org>)
 id 1tF7UF-0002JU-Vw; Sun, 24 Nov 2024 02:56:56 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To:
 From; bh=5htvk33j+nNdoI2yUfgG7cRsdw9VkL0Vki8PiZfmNFk=; b=OmxUhQcyHMnMoox6IT2S
 C45n0bPlw5Iui7O1NMP6SHVy7Q3LrTucduVRtXNABgiq6cWXuT6hMlSsdT73nVEmX5F188ROXWgIR
 e7TkluUvUynkIA1QAd1GNMiBon/6IhLFShSr77ZRjgxIHplTJ1SqYaq1OTAnXjictQOIZI5ubwoUf
 OhbeWB32e6+4WwNkRIRpFvgaskBea86eTMsBxGj+5QBDiODolJUTMJmG0avjLziert/m9gWd2LFmn
 +wBUuZL0vUWazuKwMmusx3eiY0tl2uJxu5jXy6Sky+TredC6QoS0Rb4cRV4sg5AkN1fwyAyw13qET
 con0BXUPt6SdMA==;
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 24 Nov 2024 08:55:20 +0100
Message-ID: <636bfab83864d614e1bb7e74db3810fe8f9b0fc9.1732434271.git.janneke@gnu.org>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1732434270.git.janneke@gnu.org>
References: <cover.1732434270.git.janneke@gnu.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: debbugs-submit@debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
X-BeenThere: guix-patches@gnu.org
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org
Sender: guix-patches-bounces+larch=yhetil.org@gnu.org
X-Migadu-Flow: FLOW_IN
X-Migadu-Country: US
X-Migadu-Spam-Score: -3.03
X-Spam-Score: -3.03
X-Migadu-Queue-Id: AAEE6512C
X-Migadu-Scanner: mx12.migadu.com
X-TUID: hPP6KWrRGuCp

Asking gcc to "--disable-shared" is overridden for libcc1 by the build system,
which lateron fails with

    install: cannot stat '.libs/libcc1.so.0.0.0': No such file or directory

because no shared libcc1.so.0.0.0 could actually be built.

* gnu/packages/commencement.scm (gcc-boot0)[arguments]: When building for the
64bit Hurd, add CC_FOR_BUILD to #:make-flags to convince gmp's configure that
gcc works.  Also, add phase "patch-libcc1-static" to avoid attempting a shared
libcc1.
---
 gnu/packages/commencement.scm | 36 ++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm
index 2a32485fc0..3dbd27b660 100644
--- a/gnu/packages/commencement.scm
+++ b/gnu/packages/commencement.scm
@@ -2391,13 +2391,21 @@ (define gcc-boot0
          `(let* ((libc        (assoc-ref %build-inputs "libc"))
                  (libc-native (or (assoc-ref %build-inputs "libc-native")
                                   libc)))
-            `(,(string-append "LDFLAGS="
-                              "-Wl,-rpath=" libc-native "/lib "
-                              "-Wl,-dynamic-linker "
-                              "-Wl," libc-native ,(glibc-dynamic-linker
-                                                   (match (%current-system)
-                                                     ("x86_64-linux" "i686-linux")
-                                                     (_ (%current-system))))))))
+            `(,,@(append
+                  `((string-append "LDFLAGS="
+                                   "-Wl,-rpath=" libc-native "/lib "
+                                   "-Wl,-dynamic-linker "
+                                   "-Wl," libc-native
+                                   ,(glibc-dynamic-linker
+                                     (match (%current-system)
+                                       ("x86_64-linux" "i686-linux")
+                                       (_ (%current-system))))))
+                  (if (target-hurd64?)
+                      ;;Convince gmp's configure that gcc works
+                      (list (string-append
+                             "CC_FOR_BUILD=gcc"
+                             " -Wno-implicit-function-declaration"))
+                      '())))))
         ((#:phases phases)
          #~(modify-phases #$phases
              (add-after 'unpack 'unpack-gmp&co
@@ -2421,6 +2429,20 @@ (define gcc-boot0
                                            char-set:letter)
                                         #$(package-name lib)))
                            (list gmp-6.0 mpfr mpc)))))
+             #$@(if (target-hurd64?)
+                    #~((add-after 'unpack 'patch-libcc1-static
+                         (lambda _
+                           ;;Attempting to build libcc1 shared gives:
+                           ;;  install: cannot stat '.libs/libcc1.so.0.0.0':
+                           ;;  No such file or directory
+                           ;;convince gcc harder to not build a shared libcc1
+                           (substitute* "Makefile.def"
+                             (("module= libcc1; [^;]*;") "module= libcc1;"))
+                           (substitute* "Makefile.in"
+                             (("(--target=[$][{]target_alias[}]) --enable-shared \\\\"
+                               all target)
+                              (string-append target " \\"))))))
+                    #~())
              #$(match (%current-system)
                  ((or "i686-linux" "x86_64-linux")
                   #~(add-before 'configure 'fix-libcc1
-- 
2.46.0