From patchwork Sun Nov 10 10:38:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70195 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 81AFB27BBF9; Sun, 10 Nov 2024 10:41:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9313327BBFE for ; Sun, 10 Nov 2024 10:41:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) 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 ) 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 ) 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 ) 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 Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 10 Nov 2024 10:40:10 +0000 Resent-Message-ID: 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 ) 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 ) 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 ) 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 Date: Sun, 10 Nov 2024 11:38:23 +0100 Message-ID: X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 . - "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.