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:303:e224::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by ms13.migadu.com with LMTPS
	id uIe6I56cMGdKdAAAe85BDQ:P1
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 10 Nov 2024 11:44:30 +0000
Received: from aspmx1.migadu.com ([2001:41d0:303:e224::])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
	by mp2.migadu.com with LMTPS
	id uIe6I56cMGdKdAAAe85BDQ
	(envelope-from <guix-patches-bounces+larch=yhetil.org@gnu.org>)
	for <larch@yhetil.org>; Sun, 10 Nov 2024 12:44:30 +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="ZD9/qbxc";
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Rxc8vjzx;
	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=1731239070; a=rsa-sha256; cv=none;
	b=hNh2tFLNaqk+7+Q5DWuOBzCE/75VnUC4tKVqQdOrwwMAptNIgV9IeFJfOPiWbawCBN4a9R
	XIQtf9mIIm07pU/ZdbvWXeWGZmPiU4K6+dsoDYopqAG0VCP4uzkePB1qh20m59AbJ/ocR+
	AKBAmTmEXgkpyXQfsHpKwhuXZVYLZ0rfruIlSuJw2jB1Es8hjOuPnPZs4habEfq4VhCx11
	AbK/v72at3vOCIAUE2aMa7K4J9vh/amMelWSRssSvEn/RPdN1PfHHcc5FA7GSf3Ihjvw/4
	nBKWWcv90/VtHPIPX+5q0gi7jmy+zi+ri/gIfLg5+vFLRYvvhFdEGfXqC8HJ5Q==
ARC-Authentication-Results: i=1;
	aspmx1.migadu.com;
	dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b="ZD9/qbxc";
	dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=Rxc8vjzx;
	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=1731239070;
	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=aYS46ckL+yAfnEZUwhskr1UP93kiR3VtE3K/uW3qCJw=;
	b=JSg4NuDN0wROrjpG9bwyIpKZ4ElF1PFX8i72FH7y7mOHauL0XBHQDXd94dXC028wooxa5W
	AyVR1hULNyhAbIxrKC9on6D9LHilI64qtFI9gptIHoo4yY5qwDDP+/FAn5MWWQaxJUODES
	SfxIWlbF9nyHO/ioby9qEA7QioHjbgiQEiOV8dg0ZRw5LZafWpYIhj2L9axDr5y3iP0Cqh
	CrVFuVjJZzzWDpLewWL1ywztDEJS7q/Wk8mORyLE1JiSl8Y5TBXd73NALIewxkI70vxInY
	i2b9WP3Vl/F31zABhcFhAoH/S+7vlFVbVA7Qk41bz5VnoS4sqlPiem9MlWasng==
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 45FDF7CF1
	for <larch@yhetil.org>; Sun, 10 Nov 2024 12:44:30 +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 1tA5Mb-00015L-AQ; Sun, 10 Nov 2024 05:40:13 -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 1tA5MZ-00011t-2A
 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:11 -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 1tA5MY-0008He-Ix
 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:10 -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=aYS46ckL+yAfnEZUwhskr1UP93kiR3VtE3K/uW3qCJw=; 
 b=ZD9/qbxcRteLgtPAyvH9GlWsrMsnXpB22zEUXsCI5oZkpP7cnTEZj6fByGixKwlujnpVdNrsds5MmQ6AvAmPNtR7ATaOTfvaXYlBVTP5ZDV3W+jGXdMCeUfRylC53BaITSrCXeoIEotuFcWhpPPPp7pOler+EsCav7kzZ7CI/fl4Ey41FVaIoyFX1tWVxyMJlieZ0+DGgjXVva+WBn9+mohOHgmG79qga0PORoC7LFAYaYDLss1LzX6ziWzmqu5/OgFwhFMkGCgNwdhISFop9tqKO/u4rYAfr2AeC0R5T3LW0ikte0OluijlKSSy7OxwwmX0P6xeRGKGv6HUoUiWiA==;
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1tA5MY-0002nK-D3
 for guix-patches@gnu.org; Sun, 10 Nov 2024 05:40:10 -0500
X-Loop: help-debbugs@gnu.org
Subject: [bug#74290] [PATCH 27/31] 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: Sun, 10 Nov 2024 10:40:10 +0000
Resent-Message-ID: <handler.74290.B74290.173123516810293@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.173123516810293
 (code B ref 74290); Sun, 10 Nov 2024 10:40:10 +0000
Received: (at 74290) by debbugs.gnu.org; 10 Nov 2024 10:39:28 +0000
Received: from localhost ([127.0.0.1]:55807 helo=debbugs.gnu.org)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>)
 id 1tA5Lr-0002fw-L9
 for submit@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:28 -0500
Received: from eggs.gnu.org ([209.51.188.92]:35748)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <janneke@gnu.org>) id 1tA5Li-0002d4-0k
 for 74290@debbugs.gnu.org; Sun, 10 Nov 2024 05:39:18 -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 1tA5Lc-0007ug-Qc; Sun, 10 Nov 2024 05:39:12 -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=aYS46ckL+yAfnEZUwhskr1UP93kiR3VtE3K/uW3qCJw=; b=Rxc8vjzxgMJwnqpix6km
 4pv4mTRYQPzAfrZojtCc3b1x4jq38c8pPl6UgF+5PuLt2PzU8WnX9sWV0kTDXZ4A2J6Fqsfz62jjG
 EaLqF2+5BCgGvZSuCruXtHT7YAonRIr5NZari5wIVBbnIfOr1CPO1ymu1+iKgmowzyJ0ymCSfd8IH
 C57upQA7HNgmj5MFgV3LdQfGmNSXoLwZ1FRbvYuoF1jVnx7L4calsnpBCfzUBWqsJdUnwpjnJGfwn
 DYehuulsN4xhRGSB2/qhsOPlJUYgN5iE5/8Ey3rOog5BVqBkG2uGwpmlOhu5gPQd2A+T9Zs8nThSg
 LBggBoYywM1EQg==;
From: Janneke Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 10 Nov 2024 11:38:23 +0100
Message-ID: <ab55c68442e9638d8c6e6d66732b9056686c52cf.1731232753.git.janneke@gnu.org>
X-Mailer: git-send-email 2.46.0
In-Reply-To: <cover.1731232753.git.janneke@gnu.org>
References: <cover.1731232753.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-Flow: FLOW_IN
X-Migadu-Country: US
X-Migadu-Spam-Score: 1.38
X-Spam-Score: 1.38
X-Migadu-Queue-Id: 45FDF7CF1
X-Migadu-Scanner: mx12.migadu.com
X-TUID: pcwx4VrxBmnL

* 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 6bd37fee82..136d52af51 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -111,6 +111,7 @@ (define-module (gnu packages version-control)
   #:use-module (gnu packages file)
   #:use-module (gnu packages flex)
   #:use-module (gnu packages freedesktop)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages gl)
   #:use-module (gnu packages glib)
@@ -292,7 +293,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)
@@ -301,7 +305,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