From patchwork Mon Aug 29 17:32:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Antero Mejr X-Patchwork-Id: 42069 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 8CAE827BBEA; Mon, 29 Aug 2022 18:33:23 +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 E18E727BBE9 for ; Mon, 29 Aug 2022 18:33:22 +0100 (BST) Received: from localhost ([::1]:48152 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oSidW-00041H-21 for patchwork@mira.cbaines.net; Mon, 29 Aug 2022 13:33:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51938) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oSidD-0003wq-2Y for guix-patches@gnu.org; Mon, 29 Aug 2022 13:33:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:44003) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oSidC-0005OA-G6 for guix-patches@gnu.org; Mon, 29 Aug 2022 13:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oSidC-0000w1-Bh for guix-patches@gnu.org; Mon, 29 Aug 2022 13:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#57410] [PATCH] gnu: Add ecbuild. References: <20220825172227.1110221-1-antero@mailbox.org> In-Reply-To: <20220825172227.1110221-1-antero@mailbox.org> Resent-From: Antero Mejr Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 29 Aug 2022 17:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57410 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 57410@debbugs.gnu.org Cc: antero@mailbox.org, maximedevos@telenet.be Received: via spool by 57410-submit@debbugs.gnu.org id=B57410.16617943673552 (code B ref 57410); Mon, 29 Aug 2022 17:33:02 +0000 Received: (at 57410) by debbugs.gnu.org; 29 Aug 2022 17:32:47 +0000 Received: from localhost ([127.0.0.1]:33748 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oSicw-0000vE-Ig for submit@debbugs.gnu.org; Mon, 29 Aug 2022 13:32:46 -0400 Received: from mout-p-101.mailbox.org ([80.241.56.151]:56432) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oSict-0000ux-Cz for 57410@debbugs.gnu.org; Mon, 29 Aug 2022 13:32:45 -0400 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:b231:465::2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4MGcvm67fzz9sR3; Mon, 29 Aug 2022 19:32:36 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1661794356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Pg5Tql2C3V0U77SYI4TMD0occsNtcKT5ZrnNkokoXb0=; b=IIgybkF8xD7kGGt+cbhmbnhJggeQtnhelZ3NvK8W5f9kfJm/BJr8LLfNkiwQ0SzIX37DHB qr+6SP8/oikA89MtuYyUWRhnojOcbm0gSDyx5LkyTjwDMDKy8YVSWTIa6AGVru43wxN+Qk miwUPVubkVFuw9AlJwwGb4ump013EtoEideNqkSEiiwlBSzEKyjTlFW1VioGDVaGjKpX7H 2tZTmtev5yAo1a2YSkFuzt/k4q8UGXVqbbldV66hHSiaswoe+tymMDMw2O1nYoMsZhOElG AxvqqDKQfQyAvSp6VVj15YK6sbylDx2xd1qFOBS25hKpRoD+Jea5HSMNfsGmaA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1661794354; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Pg5Tql2C3V0U77SYI4TMD0occsNtcKT5ZrnNkokoXb0=; b=GmblQ2FRv0qB7IHAguWYCr2/cfp8DsrjsVMOjIzjkpHGbDE4+almjYv+26ZUGf7sg+gtlk UeaPOODtTTKgsIB0iCyEtSgdtdilIU09T0RaPquRyHqjTM/cYts5r8snz3X2bHoysXUHM4 YDELw00LnjXncCu2GezwDYdTw2IlWQZ1AP/Q7MnoMcsHJsBqi42oRzY3sc1e81gBGCtfBV c2uu+ubCmbSsNqoF9R/FLcxlbSooGH919ioevmeFKlcWwbSNPLVxCknIcxL4sFKmtEjTRe o8vllm+OwE6mUNmmiF/GgnTxXob0xYylZ1hOcgMRnURvuqyehxI5fc5Dm2bnxQ== Date: Mon, 29 Aug 2022 13:32:12 -0400 Message-Id: <20220829173212.1494745-1-antero@mailbox.org> MIME-Version: 1.0 X-MBO-RS-META: qm6fbao5p633dhptaj7jqhmh5t399jy9 X-MBO-RS-ID: 523a22de775e2c56786 X-Rspamd-Queue-Id: 4MGcvm67fzz9sR3 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" Reply-to: Antero Mejr X-ACL-Warn: , Antero Mejr via Guix-patches X-Patchwork-Original-From: Antero Mejr via Guix-patches via From: Antero Mejr X-getmail-retrieved-from-mailbox: Patches * gnu/packages/cmake.scm (ecbuild): New variable. --- Patch Guix-specific paths in a build step rather than a snippet (from review). gnu/packages/cmake.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index cf930c57fc..be4271f84c 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -32,6 +32,7 @@ (define-module (gnu packages cmake) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix gexp) #:use-module (guix git-download) #:use-module (guix utils) #:use-module (guix deprecation) @@ -49,6 +50,7 @@ (define-module (gnu packages cmake) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages libevent) #:use-module (gnu packages ncurses) + #:use-module (gnu packages perl) #:use-module (gnu packages serialization) #:use-module (gnu packages sphinx) #:use-module (gnu packages texinfo) @@ -406,3 +408,36 @@ (define-public emacs-cmake-mode (description "@code{cmakeos-mode} provides an Emacs major mode for editing Cmake files. It supports syntax highlighting, indenting and refilling of comments."))) + +(define-public ecbuild + ;; when using set the configure flag "-DECBUILD_DISABLE_NEW_DTAGS=OFF" + ;; otherwise validate-runpath build step will fail when building Guix packages + (package + (name "ecbuild") + (version "3.7.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/ecmwf/ecbuild") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1mcjdqwvkzli7xj2wlnr4hshfh3wi5rs585f9nvqjfpgwvn0ym14")))) + (arguments + (list #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-cmake-binary-path + (lambda _ + (substitute* "bin/ecbuild" + (("cmake=\\$\\{cmakebin:=cmake\\}") + (string-append "cmake=${cmakebin:=" + #$cmake-minimal "/bin/cmake}")))))))) + (build-system cmake-build-system) + (native-inputs (list perl)) + (inputs (list cmake-minimal)) + (home-page "https://ecbuild.readthedocs.io/en/latest/") + (synopsis "CMake wrapper and collection of macros") + (description "ecBuild is built on top of CMake and consists of a set of +macros as well as a wrapper around CMake. Calling @code{ecbuild $SRC_DIR} is +equivalent to @code{cmake -DCMAKE_MODULE_PATH=$ECBUILD_DIR/cmake $SRC_DIR}.") + (license license:asl2.0)))