From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id GIriB7yW0GatWQEA62LTzQ:P1 (envelope-from ) for ; Thu, 29 Aug 2024 15:41:48 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id GIriB7yW0GatWQEA62LTzQ (envelope-from ) for ; Thu, 29 Aug 2024 17:41:48 +0200 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=AtRkiipI; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=jZH26Hba; 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=1724946107; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=BohfSXq2ZZstN8RLNEYGJOeWZzdqo+tBhzKn5tnkIQQ=; b=O656Gjtl0e6q2pyspooibaWSAYt9tAssAisZ9w8TaUNqnG31N3hRHe6dViDRJdjfYee7BN aB2RrCrYtNjSWwy69d5PiWx6bjkf66PbJjuqsIa0XBJUk7vcPAr4Ow/nbUmO+wsqQBtZjO 5nkccP2dXMLCZGJxVXjhxKGs+8tasQGplxjqHO5p3FHosQZvUcAFbqa1Jb+nsb7SxZtyXB BMlzVxptyePX5A6FH4jrBBIbrQSRHpVvgF78iiZSnzpTTIwdYaE2v7dJedJ9QKnyyZNaGa 1Obrv4n1zHukuX5PaerC4xck5HEWbg0WMbfN5P/qvWFqfp/3RDhWwib5uSnBzg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1724946107; a=rsa-sha256; cv=none; b=iCFE4uwdlSYiiRF6k0rlOZjA5UlpkbJZSEnVyaLvRrvnmAvA6YYmVXDHBoJohHE4R2uGpd hL/y4+2qeJ+SJWsNt3A6sV14yu04YiBaqBGYu+b/861ZGT3yudwfyAcU4FuCA98caouLoO jTYTcghHSwz3xjmuSnCGF4sKQz10CFui7wrgjkq1xykCCwjDZibIetg2Un4QaaWRcN3U2d 4WJIGrKUlzTXsT+NH2IxdYcuoELs28Y6EM+lX+nrzhdz+2R13UKbX8lmhJJNpFrXRTGRTy lC4D6FvuQxV632OiR64qLu9gISbYHOVBrtvq6UnfBWLcjbt+GY0Pyj8mmyJQ4Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=AtRkiipI; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=jZH26Hba; 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" 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 CE95D952C for ; Thu, 29 Aug 2024 17:41:47 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sjhGt-0005j5-Jg; Thu, 29 Aug 2024 11:41:15 -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 1sjhGn-0005fR-7B for guix-patches@gnu.org; Thu, 29 Aug 2024 11:41:09 -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 1sjhGl-0001Hx-Hq for guix-patches@gnu.org; Thu, 29 Aug 2024 11:41:08 -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:References:In-Reply-To:Date:From:To:Subject; bh=BohfSXq2ZZstN8RLNEYGJOeWZzdqo+tBhzKn5tnkIQQ=; b=AtRkiipIJrja7aNzcRZayE9amAp7r5dOHsDlN5yoJBBhzpzC9uNRksNbP8lXhtW815oC73AKuJMiguCvl6m153Tv3VvGZEXMcsOoHZPJxsrvFKpeNI0S9pDIMvutUuNwdOllqf3O5I/iF9NI5dITblAlY39GvCy730MdHw1BwHKqhwgK/z4neX/Nm7k3N+yjzxAyr6bLxYUuvE/LkLXo5v6Mi2SOEgVczE+DVZvCiJwTY+NdPHXoBLjWRKGUW6jKZl6d7l/23XZ9Zsxu47Jq3kIN855j+LiwHnqXTYY0zwbmVFhA0l5r+sPAZBRDKzu490wKVQovkUqxfUe7ilQcJw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sjhHf-0003gH-0f; Thu, 29 Aug 2024 11:42:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72877] [PATCH 7/8] gnu: sundials, sundials-openmpi: Use gexps. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 29 Aug 2024 15:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72877 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72877@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 72877-submit@debbugs.gnu.org id=B72877.172494607114024 (code B ref 72877); Thu, 29 Aug 2024 15:42:02 +0000 Received: (at 72877) by debbugs.gnu.org; 29 Aug 2024 15:41:11 +0000 Received: from localhost ([127.0.0.1]:51984 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sjhGp-0003dz-9m for submit@debbugs.gnu.org; Thu, 29 Aug 2024 11:41:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47090) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sjhGl-0003co-OH for 72877@debbugs.gnu.org; Thu, 29 Aug 2024 11:41:08 -0400 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 1sjhFm-0001CH-P5; Thu, 29 Aug 2024 11:40:06 -0400 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=BohfSXq2ZZstN8RLNEYGJOeWZzdqo+tBhzKn5tnkIQQ=; b=jZH26Hba5tmO8eAsufVu U5uvJPUYDFsg6GgtYs+1emnDC0pG9eg9XoM1505UCto1SjoN725qydTMXejrxuub8bheN5aMHtiGg b8e++y4cyH1Ra6M/YZzdFTDSaXmjK9Sav7mo8t6vv2YP0dWdkLBhkMGeyTLyq5wBO4CiBBhtkdtQr 9uwG/gUifQsr+Cq2aVaBh5Y91TY4bc/Wte1qN5eLRyuPIvuCT/UM+Yz3CgghQBKTtok5gi0faDEpr j4Fy75QhNck9YwAKBIr2Z6LeLZjD2LqExeWZyYqQwPpoZPLuXOELEzvVGQHeS3eRVOLQ6HEigvRkP tW1rE2D14hYxkg==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Thu, 29 Aug 2024 17:39:40 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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: -5.08 X-Spam-Score: -5.08 X-Migadu-Queue-Id: CE95D952C X-Migadu-Scanner: mx11.migadu.com X-TUID: WJhXoWWSdcuD * gnu/packages/maths.scm (sundials)[arguments]: Use gexps and use ‘search-input-file’ rather than ‘assoc-ref’. (sundials-openmpi)[arguments]: Likewise. Change-Id: Ife0c2ae3604cf66c90ec4a13fe9242f7fe7d550f --- gnu/packages/maths.scm | 74 +++++++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 34 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 4dc67ea313..194e4ea399 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -8051,25 +8051,28 @@ (define-public sundials (inputs (list openblas suitesparse)) (arguments - '(#:configure-flags `("-DCMAKE_C_FLAGS=-O2 -g -fcommon" + (list #:configure-flags + #~(list "-DCMAKE_C_FLAGS=-O2 -g -fcommon" - "-DSUNDIALS_INDEX_SIZE=32" - ;; Incompatible with 32-bit indices. - ;;"-DBUILD_FORTRAN_MODULE_INTERFACE:BOOL=ON" + "-DSUNDIALS_INDEX_SIZE=32" + ;; Incompatible with 32-bit indices. + ;;"-DBUILD_FORTRAN_MODULE_INTERFACE:BOOL=ON" - "-DEXAMPLES_ENABLE_C:BOOL=ON" - "-DEXAMPLES_ENABLE_CXX:BOOL=ON" - ;; Requires -DBUILD_FORTRAN_MODULE_INTERFACE:BOOL=ON. - ;;"-DEXAMPLES_ENABLE_F2003:BOOL=ON" - "-DEXAMPLES_INSTALL:BOOL=OFF" + "-DEXAMPLES_ENABLE_C:BOOL=ON" + "-DEXAMPLES_ENABLE_CXX:BOOL=ON" + ;; Requires -DBUILD_FORTRAN_MODULE_INTERFACE:BOOL=ON. + ;;"-DEXAMPLES_ENABLE_F2003:BOOL=ON" + "-DEXAMPLES_INSTALL:BOOL=OFF" - "-DENABLE_KLU:BOOL=ON" - ,(string-append "-DKLU_INCLUDE_DIR=" - (assoc-ref %build-inputs "suitesparse") - "/include") - ,(string-append "-DKLU_LIBRARY_DIR=" - (assoc-ref %build-inputs "suitesparse") - "/lib")))) + "-DENABLE_KLU:BOOL=ON" + (string-append "-DKLU_INCLUDE_DIR=" + (dirname + (search-input-file %build-inputs + "include/klu.h"))) + (string-append "-DKLU_LIBRARY_DIR=" + (dirname + (search-input-file %build-inputs + "lib/libklu.so")))))) (home-page "https://computation.llnl.gov/projects/sundials") (synopsis "Suite of nonlinear and differential/algebraic equation solvers") (description "SUNDIALS is a family of software packages implemented with @@ -8090,24 +8093,27 @@ (define-public sundials-openmpi petsc-openmpi)) (arguments (substitute-keyword-arguments (package-arguments sundials) - ((#:configure-flags flags '()) - `(cons* "-DENABLE_MPI:BOOL=ON" - "-DENABLE_HYPRE:BOOL=ON" - (string-append "-DHYPRE_INCLUDE_DIR=" - (assoc-ref %build-inputs "hypre-openmpi") - "/include") - (string-append "-DHYPRE_LIBRARY_DIR=" - (assoc-ref %build-inputs "hypre-openmpi") - "/lib") - "-DENABLE_PETSC:BOOL=ON" - (string-append "-DPETSC_INCLUDE_DIRS=" - (assoc-ref %build-inputs "petsc-openmpi") - "/include") - ,flags)) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (add-before 'check 'mpi-setup - ,%openmpi-setup))))) + ((#:configure-flags flags #~()) + #~(cons* "-DENABLE_MPI:BOOL=ON" + "-DENABLE_HYPRE:BOOL=ON" + (string-append "-DHYPRE_INCLUDE_DIR=" + (dirname + (search-input-file %build-inputs + "include/HYPRE.h"))) + (string-append "-DHYPRE_LIBRARY_DIR=" + (dirname + (search-input-file %build-inputs + "lib/libHYPRE.so"))) + "-DENABLE_PETSC:BOOL=ON" + (string-append "-DPETSC_INCLUDE_DIRS=" + (dirname + (search-input-file %build-inputs + "include/petsc.h"))) + #$flags)) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-before 'check 'mpi-setup + #$%openmpi-setup))))) (synopsis "SUNDIALS with MPI support"))) (define-public sundials-5 -- 2.45.2