From patchwork Tue Nov 19 06:54:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janneke Nieuwenhuizen X-Patchwork-Id: 70515 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 38AB827BBE9; Tue, 19 Nov 2024 06:59:37 +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,URIBL_BLOCKED autolearn=unavailable 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 C922927BBE2 for ; Tue, 19 Nov 2024 06:59:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tDICk-0008Oz-CN; Tue, 19 Nov 2024 01: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 ) id 1tDICg-0008N1-Rz for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:14 -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 1tDICg-0004Jx-JA for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:14 -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=cCAl94rsMNTlvu6NprBvKee9APP2XEpDFhvQ0GdiLAg=; b=TGV7SSUm5910Sa/Q2iHulsQwWHLO4ZAVD2qPbcNdmFQwUG3VhuVthQIOjDgfhy0DIFLEwkmXcsFWuFZwrOICnk8C7Zf0+FiMvUq/JpluaF9eusOGuyOQkAB2LEh+uPCh8a1caftM7QIXJLrQ7hWtNWffTaAVBVlWq1Aqut9yityX0BYEdY2L1Qvq/uQhudSJC5lpqGB0BKHSiuGNFp5iHQPkYNlHSSh1aL6P6yg32Zrb25sE54EDWX3RRe39vfe5h15nZBTdtbgUSbIk2ZqPDXaGYOm6D9UCteHBaG7w8WMtFqw+WCBkmgivJ3hep0zZc46PKAp87VuPFssmyeTkJg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tDICg-0005Hc-DW for guix-patches@gnu.org; Tue, 19 Nov 2024 01:59:14 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74290] [PATCH v3 14/51] gnu: git-minimal: Support [cross-]build with gcc-14 and the 64bit Hurd. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Nov 2024 06:59:14 +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.173199950819794 (code B ref 74290); Tue, 19 Nov 2024 06:59:14 +0000 Received: (at 74290) by debbugs.gnu.org; 19 Nov 2024 06:58:28 +0000 Received: from localhost ([127.0.0.1]:40475 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBv-000595-GC for submit@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48526) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tDIBn-00056l-D5 for 74290@debbugs.gnu.org; Tue, 19 Nov 2024 01:58:19 -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 1tDI9b-0003yD-Cg; Tue, 19 Nov 2024 01:56:03 -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=cCAl94rsMNTlvu6NprBvKee9APP2XEpDFhvQ0GdiLAg=; b=a6vMB2lHOZhfDFUCH9mb lOZcC0tatyLkz/nlDVklyOYbaZ/xbyb2JV43lI4e+aUf0B3h4/viRTMDCM0q5B4ghInJdHhAcAgvx +ftuG90TbiyUJHgJVt0r2QSFgePorRrAjP9+5Yp3VYxZ4d2exl/O8Q5qBDR90loZKzqNuKCkIP/eJ Uty+ybMWRvCq6OCdltxpUGFXqxs4k9uOQrLAJKjEsBdfMclxrpWz4mP51gNJGRL9PlPiNCiRzkiPZ iDtmW3eDYZ6sjEaatqvIE89E7Il++X2NT8mCpU6uUGkrZd/vTvWxxK/IMOF69OIPg4HevGQJSVEpL wg8lPAmzsQAeuw==; From: Janneke Nieuwenhuizen Date: Tue, 19 Nov 2024 07:54:44 +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 building for the 64bit Hurd, or cross-compiling, 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 | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c892a83a98..ca77b485ad 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -296,7 +296,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 (or (target-hurd64?) (%current-target-system)) + #~("-Wno-implicit-function-declaration") + #~())) #:phases #~(modify-phases %standard-phases #$@(if (%current-target-system) @@ -305,7 +308,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.