From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <guix-patches-bounces+larch=yhetil.org@gnu.org>
Received: from mp2.migadu.com ([2001:41d0:403:4876::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms13.migadu.com with LMTPS
	id 6J65CiKPM2fQMwAAe85BDQ:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 12 Nov 2024 17:23:46 +0000
Received: from aspmx1.migadu.com ([2001:41d0:403:4876::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp2.migadu.com with LMTPS
	id 6J65CiKPM2fQMwAAe85BDQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Tue, 12 Nov 2024 18:23:46 +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=A5JAHscT;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=rhakRvsi;
	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=1731432226; a=rsa-sha256; cv=none;
	b=SSkRMaM8KA430tS3I8LPoxk4RQnoNQdmeVaXc4HLtXt+OewyvqKCZx/qdME9B2ab9zx4fO
	YaQhufNEFo1cPAnMtHbF5WcO72Os06LnP8XIxtnOiJD9Q/nbcgbBdPgz21X16q96/x2L6f
	jqIqzggFdF63S5AG+3SIcocsxLqCKTTVNjWOmdIjdEKckfeZg1UhKrluRAvSqHbOMvYY3i
	bZeZTSW6cMQrRiz1rbfM2E8oVbpdJ8EcIqLnTxfDV+xRqMbpaxWNcrJHDBovjEfHMc+qdG
	04zskmGr7t3XqFjbbu/JoIRqHkOKG9yNbEBPhWg5bPfjAO6Hi465JgeqnxvHtw==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=A5JAHscT;
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=rhakRvsi;
	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=1731432226;
	h=from:from:sender:sender:reply-to:subject:subject:date:date:
	 message-id:message-id:to:to:cc:mime-version:mime-version:
	 content-type:content-type:
	 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=jASOoYdyIeHbzrzcZNjDPWmRBAYZvQS+11ApmDDXphQ=;
	b=T92yVL3vHsMtD+dEwyPrCY6KgxM2ebVByTJ+8igyU9TsScv6tMr2lagNzufo1ktda4Kpi8
	1Wem9VlXcduUPLi+2HYtvf9cc8QCPncArlDxO3Ev0n49aOm09+FJkPrcwv5D63Aw850Ch5
	yKziSlp5UAinsBQmq6EWnJ+tI5IEhUhVVQgt8x+FvJz5bmH2ocvGISe+GDwTzE35JlEtJ5
	8KL68Lsnc4HJsfpuUzL6dSlqxqaHlsU/TSeg7RF85DkdPuu65M+HcZGdRwY1cWFroolgkD
	pjkVHfkOcB8SSUO1GjzlNS6psxT1cK6HrbQSh+/BugqwLf30Hc5R3ktcIWiuoA==
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 713E571EE1
	for <larch@yhetil.org>; Tue, 12 Nov 2024 18:23:45 +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 1tAtma-00045U-Co; Tue, 12 Nov 2024 11:30:24 -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 1tAtmY-00043M-8J
 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:22 -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 1tAtmX-0005yM-U2
 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:21 -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=jASOoYdyIeHbzrzcZNjDPWmRBAYZvQS+11ApmDDXphQ=; 
 b=A5JAHscTasC7WP1TEAsgwqIh0hZyugRsC17/LJTkSqxBc5moGDZTghx72qfq9es1WwbDyqsn3tFKosq9bwLnfi+ENXqhErq2XopT1qFWgqvpDqOZvZEyQ90VoxvgjEH50u/6mruqBEUdgzdy3kNaZ1VwzsgK+mYQnmcTVdnvNhltd1VhY63hVHwc/JC1wFySMc4rRzhrsrTX1oRkWOK7c+4eh3gXA3iuC4w2Gdk79qvyH6HATfL3GcFaoh25KDdL4Rwl4VYEs3B9bgQxrvw67ugHYmYq5t9saMtKMA9nbrCckYpVlK9i1teJ+LsExYi+b76h4QXeq4lA5yDllBYjXw==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tAtmX-0000Yt-KU
 for guix-patches@gnu.org; Tue, 12 Nov 2024 11:30:21 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#74290] [PATCH v2 27/40] gnu: git-minimal: Support the 64bit Hurd.
Resent-From: Janneke Nieuwenhuizen <janneke@gnu.org>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-CC: guix-patches@gnu.org
Resent-Date: Tue, 12 Nov 2024 16:30:21 +0000
Resent-Message-ID: <handler.74290.B74290.17314290021508@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
Received: via spool by 74290-submit@debbugs.gnu.org id=B74290.17314290021508
 (code B ref 74290); Tue, 12 Nov 2024 16:30:21 +0000
Received: (at 74290) by debbugs.gnu.org; 12 Nov 2024 16:30:02 +0000
Received: from localhost ([127.0.0.1]:39167 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tAtmD-0000Nj-19
 for submit@debbugs.gnu.org; Tue, 12 Nov 2024 11:30:01 -0500
Received: from eggs.gnu.org ([209.51.188.92]:43192)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <janneke@gnu.org>) id 1tAtln-0000JX-Ob
 for 74290@debbugs.gnu.org; Tue, 12 Nov 2024 11:29:36 -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 1tAtjc-0005P3-58; Tue, 12 Nov 2024 11:27:20 -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=jASOoYdyIeHbzrzcZNjDPWmRBAYZvQS+11ApmDDXphQ=; b=rhakRvsiyi9SNY/Z1+8g
 4uGu5x74IJ54Kai11Lf8Yr7dN3if6THG8OYPC7rkOZOZltU7n+MmczYFGjBgbs02uDO9cLu8k/oZo
 aSe+WG7dHTg6EEaFPKONI0WvLN3Ux2J1ZQYgxoFRJPCEBe07c9EP0rDKUBRWYYmBdt7mREQPUSU6S
 DyKgocmCH3eeLL2e+bO/zXxyrW7GrLSm9z2jDhT5PmudcbG6Lq5aXdtZ/TkdTBrX6zTjnXZODPq/i
 l8fVy+68cE7tEZEKJOR8loylimaPZRIhjOtrCFUlKlhQmpVRsi3FshVoULj4XxZJZvyYS7mqGD+Nt
 Gce+8GdaO/VO2w==;
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 12 Nov 2024 17:25:36 +0100
Message-ID: <a32f714f0556a99e042e2500945569a5278c8fec.1731427612.git.janneke@gnu.org>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1731427612.git.janneke@gnu.org>
References: <cover.1731427612.git.janneke@gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
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-Country: US
X-Migadu-Flow: FLOW_IN
X-Migadu-Spam-Score: -2.54
X-Spam-Score: -2.54
X-Migadu-Queue-Id: 713E571EE1
X-Migadu-Scanner: mx10.migadu.com
X-TUID: K+7mjn2vh36X

* gnu/packages/version-control.scm (git-minimal)[arguments]: When using gcc >=
14, use "-Wno-implicit-function-declaration" in #:make-flags.
Use target-hurd? instead of comparing with "i586-pc-gnu" in "use-host-uname_S"
phase.

Change-Id: Ib9836be8a1e389a82c8a89adf22aaeac0d85bd14
---
 gnu/packages/version-control.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index c892a83a98..325b7ca8d8 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -113,6 +113,7 @@ (define-module (gnu packages version-control)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages freedesktop)
   #:use-module (gnu packages gawk)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
@@ -296,7 +297,10 @@ (define-public git-minimal
               ;; By default 'make install' creates hard links for
               ;; things in 'libexec/git-core', which leads to huge
               ;; nars; see <https://bugs.gnu.org/21949>.
-              "NO_INSTALL_HARDLINKS=indeed")
+              "NO_INSTALL_HARDLINKS=indeed"
+              #$@(if (version>=? (package-version (current-gcc)) "14")
+                     #~("-Wno-implicit-function-declaration")
+                     #~()))
       #:phases
       #~(modify-phases %standard-phases
           #$@(if (%current-target-system)
@@ -305,7 +309,7 @@ (define-public git-minimal
                       (lambda _
                         (substitute* "config.mak.uname"
                           (("uname_S := .*" all)
-                           (if (equal? #$(%current-target-system) "i586-pc-gnu")
+                           (if #$(target-hurd?)
                                "uname_S := GNU\n"
                                all))))))
                  ;; We do not have a full bash when cross-compiling.
-- 
Janneke Nieuwenhuizen <janneke@gnu.org>  | GNU LilyPond https://LilyPond.org
Freelance IT https://www.JoyOfSource.com | AvatarĀ® https://AvatarAcademy.com