From patchwork Mon Jul 25 12:33:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 40948 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 57BB527BBEA; Mon, 25 Jul 2022 13:55:57 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 3322027BBE9 for ; Mon, 25 Jul 2022 13:55:56 +0100 (BST) Received: from localhost ([::1]:48476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oFxcp-0006ix-7d for patchwork@mira.cbaines.net; Mon, 25 Jul 2022 08:55:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oFxHf-00077h-DO for guix-patches@gnu.org; Mon, 25 Jul 2022 08:34:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:59773) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oFxHe-000863-Gg for guix-patches@gnu.org; Mon, 25 Jul 2022 08:34:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oFxHe-0003R5-Cn for guix-patches@gnu.org; Mon, 25 Jul 2022 08:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56760] [PATCH 2/6] gnu: dealii: Use G-expressions. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jul 2022 12:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56760 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56760@debbugs.gnu.org Cc: "Paul A. Patience" Received: via spool by 56760-submit@debbugs.gnu.org id=B56760.165875241113111 (code B ref 56760); Mon, 25 Jul 2022 12:34:02 +0000 Received: (at 56760) by debbugs.gnu.org; 25 Jul 2022 12:33:31 +0000 Received: from localhost ([127.0.0.1]:49505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFxH8-0003PN-PN for submit@debbugs.gnu.org; Mon, 25 Jul 2022 08:33:31 -0400 Received: from mail-4022.proton.ch ([185.70.40.22]:16333) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oFxH4-0003Ot-Hf for 56760@debbugs.gnu.org; Mon, 25 Jul 2022 08:33:29 -0400 Date: Mon, 25 Jul 2022 12:33:12 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1658752400; x=1659011600; bh=zBizTll9N5FAv/V+puRpQSZFirJZs2k9yTXo2FoUPpk=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:In-Reply-To: References:Feedback-ID:From:To:Cc:Date:Subject:Reply-To: Feedback-ID:Message-ID; b=CuV9BEgksxRIoYKtaLA5GoplYoerkziMWqfKN7dOkRie2LGsOBw82Y619/UCpyjLB h1SsmYYJ6Zrn6iQsWBlwFdNQ+HV6bOhQ9f02BYjWUahjf8pEvJ2yrIKwWNmXxHEc6H LoJMrY9ql9rBuvsJgR3hVWwc+QqkOWPblPiz/E0VZlDm+u4fjX8KjIbl+H19vX7fka EQ+6DvzlC2BK4Hl9PXpI0wVkYdc/eua55OM8iTT8/Bbm9JJ6SvmH+3zvbkdEN48rnL a0R0sa7ApOgkSdS2L+4WVu09rFLlnDjuo0ie9n8zVWZVvX25mMFXY1euj4QEWZfR0Y ZOE8c8zEkefpg== From: "Paul A. Patience" Message-ID: <20220725123303.3863582-2-paul@apatience.com> In-Reply-To: <20220725123303.3863582-1-paul@apatience.com> References: <20220725123303.3863582-1-paul@apatience.com> Feedback-ID: 19227857:user:proton 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (dealii)[snippet, arguments]: Use G-expressions. (dealii-openmpi)[arguments]: Same. --- gnu/packages/maths.scm | 60 ++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 28 deletions(-) -- 2.37.1 diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 948776e9d4..7d4049c689 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -5287,7 +5287,7 @@ (define-public dealii (modules '((guix build utils))) (snippet ;; Remove bundled boost, muparser, TBB and UMFPACK. - '(delete-file-recursively "bundled")))) + #~(delete-file-recursively "bundled")))) (build-system cmake-build-system) (outputs '("out" "doc")) (native-inputs @@ -5315,32 +5315,36 @@ (define-public dealii sundials-5 tbb)) (arguments - `(#:build-type "DebugRelease" ; Supports only Debug, Release and DebugRelease. - ;; The tests take too long and must be explicitly enabled with "make - ;; setup_tests". - ;; See https://www.dealii.org/developer/developers/testsuite.html. - ;; (They can also be run for an already installed deal.II.) - #:tests? #f - #:configure-flags - (let ((doc (string-append (assoc-ref %outputs "doc") - "/share/doc/" ,name "-" ,version))) - `("-DDEAL_II_COMPONENT_DOCUMENTATION=ON" - ,(string-append "-DDEAL_II_DOCREADME_RELDIR=" doc) - ,(string-append "-DDEAL_II_DOCHTML_RELDIR=" doc "/html") - ;; Don't compile the examples because the source and CMakeLists.txt - ;; are installed anyway, allowing users to do so for themselves. - "-DDEAL_II_COMPILE_EXAMPLES=OFF" - ,(string-append "-DDEAL_II_EXAMPLES_RELDIR=" doc "/examples"))) - #:phases - (modify-phases %standard-phases - (add-after 'install 'remove-build-logs - ;; These build logs leak the name of the build directory by storing - ;; the values of CMAKE_SOURCE_DIR and CMAKE_BINARY_DIR. - (lambda* (#:key outputs #:allow-other-keys) - (let ((doc (string-append (assoc-ref outputs "doc") - "/share/doc/" ,name "-" ,version))) - (for-each delete-file (map (lambda (f) (string-append doc "/" f)) - '("detailed.log" "summary.log"))))))))) + (list #:build-type "DebugRelease" ; Only Debug, Release or DebugRelease. + ;; The tests take too long and must be explicitly enabled with + ;; "make setup_tests". + ;; See https://www.dealii.org/developer/developers/testsuite.html. + ;; (They can also be run for an already installed deal.II.) + #:tests? #f + #:configure-flags + #~(let ((doc (string-append #$output:doc "/share/doc/" + #$name "-" #$version))) + (list "-DDEAL_II_COMPONENT_DOCUMENTATION=ON" + (string-append "-DDEAL_II_DOCREADME_RELDIR=" doc) + (string-append "-DDEAL_II_DOCHTML_RELDIR=" doc "/html") + ;; Don't compile the examples because the source and + ;; CMakeLists.txt are installed anyway, allowing users to + ;; do so for themselves. + "-DDEAL_II_COMPILE_EXAMPLES=OFF" + (string-append "-DDEAL_II_EXAMPLES_RELDIR=" doc + "/examples"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'install 'remove-build-logs + ;; These build logs leak the name of the build directory by + ;; storing the values of CMAKE_SOURCE_DIR and + ;; CMAKE_BINARY_DIR. + (lambda _ + (let ((doc (string-append #$output:doc "/share/doc/" + #$name "-" #$version))) + (for-each delete-file + (map (lambda (f) (string-append doc "/" f)) + '("detailed.log" "summary.log"))))))))) (home-page "https://www.dealii.org/") (synopsis "Finite element library") (description @@ -5373,7 +5377,7 @@ (define-public dealii-openmpi (arguments (substitute-keyword-arguments (package-arguments dealii) ((#:configure-flags flags) - `(cons "-DDEAL_II_WITH_MPI=ON" ,flags)))) + #~(cons "-DDEAL_II_WITH_MPI=ON" #$flags)))) (synopsis "Finite element library (with MPI support)"))) (define-public flann