From patchwork Mon Jul 28 15:50:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Garlick X-Patchwork-Id: 43337 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 3275327BC49; Mon, 28 Jul 2025 16:52:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,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 EFAD227BC4A for ; Mon, 28 Jul 2025 16:52:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ugQ9J-0000Qw-88; Mon, 28 Jul 2025 11:52:25 -0400 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 1ugQ8z-0005bZ-BO for guix-patches@gnu.org; Mon, 28 Jul 2025 11:52:07 -0400 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 1ugQ8x-0003ao-7j for guix-patches@gnu.org; Mon, 28 Jul 2025 11:52:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=OLtYs+ygtRULj0J4IMtsUzy6QOeISOro91Xw06jlsvs=; b=cCaZgGUp+EyTLfHXYhyXDZcU6AGs31COZHjzlKEXvd8nPNTR8VL1a6ih2s/VpgmqA1+LqW1aTaZbHDLX6dNTMtOM+S4yNEKoOw42GauIcoSXq+1GrjGucoAj+pMeN+pQTv0Xl2L1OisyqXMzfFlRoex5K62L4vfZytIQZSrt78pmLEAplJaUgRBLLeoplXYtJ+oJ2XjyyIEESeFjAOQDS44X8TiwMh+cY9idASKipyN5hMapUJGLeO3o/uOu4cm3VWJpwaUQ5LEN+rqb0pLJdyVX0vwc4VdKBa5vFFt7EX2ucyfPyLexUnldTucQGpfryQ2FwDJR/SyVFyF/IqwDQg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ugQ8w-0005Fk-Rn for guix-patches@gnu.org; Mon, 28 Jul 2025 11:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#79114] [PATCH] gnu: fenics-dolfin: Fix build with gcc@14. Resent-From: Paul Garlick Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Jul 2025 15:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 79114 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 79114@debbugs.gnu.org Cc: Paul Garlick X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.175371788720039 (code B ref -1); Mon, 28 Jul 2025 15:52:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Jul 2025 15:51:27 +0000 Received: from localhost ([127.0.0.1]:56724 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ugQ8M-0005D4-M6 for submit@debbugs.gnu.org; Mon, 28 Jul 2025 11:51:27 -0400 Received: from lists.gnu.org ([2001:470:142::17]:37570) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1ugQ8J-0005CH-K5 for submit@debbugs.gnu.org; Mon, 28 Jul 2025 11:51:24 -0400 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 1ugQ8C-0004VN-69 for guix-patches@gnu.org; Mon, 28 Jul 2025 11:51:16 -0400 Received: from smtp.hosts.co.uk ([85.233.160.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ugQ89-0003TH-L5 for guix-patches@gnu.org; Mon, 28 Jul 2025 11:51:15 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tourbillion-technology.com; s=2025040300; h=Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Content-Type:Content-ID :Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To: Resent-Cc:Resent-Message-ID:In-Reply-To:References; bh=OLtYs+ygtRULj0J4IMtsUzy6QOeISOro91Xw06jlsvs=; b=9yXdMjnZWFpN+wqCaYSzeDKZ9V RmLk2vyg2J5KdS7A5KZcPTwvPlKJxOFfYX8Ys6pkw/rcQAPebRvp9+8LWeg8vwb+sAHYGdANXaTkz Cna/yJ0ymI+RiT4Gisz1nifMIRkSdJLXFYgLFI1fDS3DtUEWmuwBEaj2uOsJqEIhMTOw=; Received: from maikeh336.claranet.co.uk ([79.123.23.187] helo=pumpernickel.tourbillion-technology.com) by smtp.hosts.co.uk with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim) (envelope-from ) id 1ugQ80-00000000Bzf-2IYR; Mon, 28 Jul 2025 16:51:06 +0100 From: Paul Garlick Date: Mon, 28 Jul 2025 16:50:36 +0100 Message-Id: <20250728155036.262879-1-pgarlick@tourbillion-technology.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Received-SPF: pass client-ip=85.233.160.19; envelope-from=pgarlick@tourbillion-technology.com; helo=smtp.hosts.co.uk X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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/patches/fenics-dolfin-integer-types.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register new patch. * gnu/packages/simulation.scm (fenics-dolfin)[source]: Use new patch. --- gnu/local.mk | 1 + .../patches/fenics-dolfin-integer-types.patch | 29 +++++++++++++++++++ gnu/packages/simulation.scm | 3 +- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/fenics-dolfin-integer-types.patch diff --git a/gnu/local.mk b/gnu/local.mk index 6e4664ac35..16d39fd207 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1294,6 +1294,7 @@ dist_patch_DATA = \ %D%/packages/patches/fenics-dolfin-boost.patch \ %D%/packages/patches/fenics-dolfin-config-slepc.patch \ %D%/packages/patches/fenics-dolfin-hdf5-version-check.patch \ + %D%/packages/patches/fenics-dolfin-integer-types.patch \ %D%/packages/patches/ffmpeg-add-av_stream_get_first_dts-for-chromium.patch \ %D%/packages/patches/ffmpeg-jami-change-RTCP-ratio.patch \ %D%/packages/patches/ffmpeg-jami-rtp_ext_abs_send_time.patch \ diff --git a/gnu/packages/patches/fenics-dolfin-integer-types.patch b/gnu/packages/patches/fenics-dolfin-integer-types.patch new file mode 100644 index 0000000000..97cc13f95f --- /dev/null +++ b/gnu/packages/patches/fenics-dolfin-integer-types.patch @@ -0,0 +1,29 @@ +This patch updates the integer types used in two of the dolfin header files. +The changes enable building with gcc-13 and above. + +See for the porting notes. + +See for the upstream fix. + +--- a/dolfin/common/timing.h ++++ b/dolfin/common/timing.h +@@ -39,7 +39,7 @@ + /// + /// Precision of wall is around 1 microsecond, user and system are around + /// 10 millisecond (on Linux). +- enum class TimingType : int32_t { wall = 0, user = 1, system = 2 }; ++ enum class TimingType : int { wall = 0, user = 1, system = 2 }; + + /// Start timing (should not be used internally in DOLFIN!) + void tic(); + +--- a/dolfin/mesh/MeshConnectivity.h ++++ b/dolfin/mesh/MeshConnectivity.h +@@ -24,5 +24,7 @@ + #include + #include + ++#include ++ + namespace dolfin + { diff --git a/gnu/packages/simulation.scm b/gnu/packages/simulation.scm index ba41bf658e..5568a567ae 100644 --- a/gnu/packages/simulation.scm +++ b/gnu/packages/simulation.scm @@ -755,7 +755,8 @@ (define-public fenics-dolfin "fenics-dolfin-demo-init.patch" "fenics-dolfin-boost.patch" "fenics-dolfin-config-slepc.patch" - "fenics-dolfin-hdf5-version-check.patch")) + "fenics-dolfin-hdf5-version-check.patch" + "fenics-dolfin-integer-types.patch")) (modules '((guix build utils))) (snippet '(begin ;; Make sure we don't use the bundled test framework.