From patchwork Thu Dec 22 19:07:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 45512 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 192DB27BBEB; Thu, 22 Dec 2022 19:21:30 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 370C927BBE9 for ; Thu, 22 Dec 2022 19:21:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p8R7q-00008S-Pd; Thu, 22 Dec 2022 14:21:06 -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 1p8R7n-00008A-LO for guix-patches@gnu.org; Thu, 22 Dec 2022 14:21:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p8R7m-00073I-9m for guix-patches@gnu.org; Thu, 22 Dec 2022 14:21:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p8R7m-0004i0-5c for guix-patches@gnu.org; Thu, 22 Dec 2022 14:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60039] Update GDAL and NetCDF and include lz4 and openjpeg support Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 22 Dec 2022 19:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60039 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Guillaume Le Vaillant Cc: 60039@debbugs.gnu.org Received: via spool by 60039-submit@debbugs.gnu.org id=B60039.167173683618061 (code B ref 60039); Thu, 22 Dec 2022 19:21:02 +0000 Received: (at 60039) by debbugs.gnu.org; 22 Dec 2022 19:20:36 +0000 Received: from localhost ([127.0.0.1]:36228 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8R7L-0004hF-HN for submit@debbugs.gnu.org; Thu, 22 Dec 2022 14:20:36 -0500 Received: from mail-ed1-f47.google.com ([209.85.208.47]:33284) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p8R7J-0004h4-6Z for 60039@debbugs.gnu.org; Thu, 22 Dec 2022 14:20:34 -0500 Received: by mail-ed1-f47.google.com with SMTP id d20so4344264edn.0 for <60039@debbugs.gnu.org>; Thu, 22 Dec 2022 11:20:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20210112.gappssmtp.com; s=20210112; h=mime-version:message-id:in-reply-to:date:subject:cc:to:from :user-agent:references:from:to:cc:subject:date:message-id:reply-to; bh=VQ6nEJiHvB0Uz9R/HwXL9ZVJHZMCkzpvrFi90zIH/kw=; b=WH/vHMt0HPFI3xsT3kbILb9P8yHB9/XI3mX0XHOUoQ2Q4ZtPGZVnd+fVCsRPEiNUOJ d5jV1XTrCxupvEiCRezunyyqV2a4a3pIqERHiN34nkyVLnoD9IpxrFL2KI2AVmXwd8vu oW6ncOgf+A6CvG832aRehj9Mr1lhaUxN4o7pJ9fLXNpe8Cuv5X94q2EP/lsj3zClw0a9 5wjfm0jBtruuSMGUcjzjCpmsaGOcAJLIidbOyc58LU2wIHzOTyilZYzZ5Bo3eJ+6ePI4 T99NHFpc8EzyzUOhHSxCmpZo0X1p+/ZQJ58L0YJm/WRIMKr44OzTwLpB6fytQ5Lyhgeq sUxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:in-reply-to:date:subject:cc:to:from :user-agent:references:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=VQ6nEJiHvB0Uz9R/HwXL9ZVJHZMCkzpvrFi90zIH/kw=; b=cWtjPMZpu0hEDKN6zHks7Jpo2SGARvesU5IvWKywl55PvMR0WVOehqtlcbgwlBObNJ 8ELZKHfksaRwD6QDbc0IrdPuU86o1Slo/5yyfg+G08MZOBci0OA3ihy5Kc5zx3BWy+5j KaUWNKaZGqeBrITlN8DlT1fW7doxrJGzceFXKTtwIE0QlpHqmp0VIV+h4BJqurBAe0So RjPoLxfehPRh+iF6CmA43ZCtOLKs1M7FjAHbpkA8lmdKt7FpppRxHcJbP89J+fIvvQOa XFdRb+q/YHn5yg3kH7fTssZBsCXufF0ARzm1+MhdeBVGkPFqLGI8sD23wBp8lNxeTtmC UVNw== X-Gm-Message-State: AFqh2koaEXs0Je7OzwOBtkOrIzBvNFZZud/aS5yeFEdFSheLzVCtZTdY A3MBYt/f42ToWndzoojRyF/NcdIkXFDSq3h5+C0= X-Google-Smtp-Source: AMrXdXv3FbwMmnNGvhTNcAWPqejk/RcuygN4bnJxpT7ySjEPlrVK3CtDvKV+jcMBalHDcRAky2z5Mg== X-Received: by 2002:aa7:ce11:0:b0:464:5ec3:c46 with SMTP id d17-20020aa7ce11000000b004645ec30c46mr6018163edv.16.1671736825894; Thu, 22 Dec 2022 11:20:25 -0800 (PST) Received: from precision (tmo-117-170.customers.d1-online.com. [80.187.117.170]) by smtp.gmail.com with ESMTPSA id m9-20020a1709062ac900b007c0d41736c0sm551593eje.39.2022.12.22.11.20.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Dec 2022 11:20:25 -0800 (PST) References: <86mt7rp4c5.fsf@burningswell.com> <87y1r2c7fs.fsf@kitej> <86v8m5nava.fsf@burningswell.com> <87fsd74s9n.fsf@kitej> User-agent: mu4e 1.8.11; emacs 29.0.50 From: Roman Scherer Date: Thu, 22 Dec 2022 20:07:43 +0100 In-reply-to: <87fsd74s9n.fsf@kitej> Message-ID: <86zgbfqm88.fsf@burningswell.com> 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 Hi Guillaume, sorry about that. Here is another patch. The failed dependencies you mentioned are working now. Another reason why netcdf-parallel-openmpi failed was that I changed the build system previously to cmake. I went back to use the original gnu build system. I changed it to cmake initially because I saw that in Arch Linux's PKGBUILD and I remember having had some problems initially. I guess it was related to the tests I now patched. While at the topic. Do we prefer any build system over the other in general in Guix, like cmake vs gnu. Does one have more features than the other (I heard something about cross compilation)? And another question. How did you find the failing dependencies in the first place? Did you build all the dependencies of the netcdf packages with --sources=all? Thanks for the help. Roman Guillaume Le Vaillant writes: > [[PGP Signed Part:Undecided]] > Roman Scherer skribis: > >> Hi Guillaume, >> >> here's the updated patch for Netcdf. I checked the tests again, I >> believe I left some of them off by accident after trying a couple of >> things. So, I enabled some of them again. They pass. However, I left the >> remote and large file tests still turned off. >> >> I believe the remote tests we do not want anyway on Guix CICD >> system. Is that correct? And the large file tests seem to take ages. Can >> we ignore them, because they are super annoying? >> >> Thanks for the review. >> >> Wdyt? >> >> Roman. >> >> [2. text/x-diff; 0005-gnu-netcdf-Update-to-4.9.0.patch]... > > Hi, > > The build environment doesn't have network access, so indeed remote > tests have to be disabled. > > The netcdf-parallel-openmpi package fails to build with the updated > netcdf. I think it's because the package definition for > netcdf-parallel-openmpi inherits from the package definition for netcdf, > so it has to be updated to take into consideration the build-system > change of netcdf. > > There are also some dependents that fail to build (cdo, python-h5netcdf, > python-meshio, qgis). I saw some error messages about conflicting > versions of hdf5, probably because in your patch netcdf uses hdf5-1.12 > and the dependents also have hdf5 (v1.10) in their dependency graph in > some way. Maybe this could be fixed by using hdf5 instead of hdf5-1.12 > for netcdf... > > Could take a look? > > [[End of PGP Signed Part]] From a5ad4273294d0d92eec1eeab2173f12bfe36b74b Mon Sep 17 00:00:00 2001 From: r0man Date: Thu, 22 Dec 2022 19:41:14 +0100 Subject: [PATCH] gnu: netcdf: Update to 4.9.0. * gnu/packages/maths.scm (netcdf): Update to 4.9.0. --- gnu/packages/maths.scm | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 050450e12c..0d1c65636b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1852,16 +1852,16 @@ (define-public itpp (define-public netcdf (package (name "netcdf") - (version "4.7.4") + (version "4.9.0") (source (origin (method url-fetch) (uri (string-append - "https://www.unidata.ucar.edu/downloads/netcdf/ftp/" - "netcdf-c-" version ".tar.gz")) + "https://downloads.unidata.ucar.edu/netcdf-c/" version + "/netcdf-c-" version ".tar.gz")) (sha256 (base32 - "1a2fpp15a2rl1m50gcvvzd9y6bavl6vjf9zzf63sz5gdmq06yiqf")) + "0j8b814mjdqvqanzmrxpq8hn33n22cdzb3gf9vhya24wnwi615ac")) (modules '((guix build utils))) (snippet ;; Make sure this variable is defined only once. Failing to do so @@ -1874,13 +1874,18 @@ (define-public netcdf (native-inputs (list m4 doxygen graphviz)) (inputs - `(("hdf4" ,hdf4-alt) + `(("curl" ,curl) + ("hdf4" ,hdf4-alt) ("hdf5" ,hdf5) - ("curl" ,curl) - ("zlib" ,zlib) - ("libjpeg" ,libjpeg-turbo))) + ("libjpeg" ,libjpeg-turbo) + ("libxml2" ,libxml2) + ("unzip" ,unzip) + ("zlib" ,zlib))) (arguments - `(#:configure-flags '("--enable-doxygen" "--enable-dot" "--enable-hdf4") + `(#:configure-flags '("--enable-doxygen" + "--enable-dot" + "--enable-hdf4" + "--disable-dap-remote-tests") #:phases (modify-phases %standard-phases (add-before 'configure 'fix-source-date @@ -1891,8 +1896,7 @@ (define-public netcdf ;; package not reproducible. (substitute* "./configure" (("date -u -d \"\\$\\{SOURCE_DATE_EPOCH\\}\"") - "date --date='@0'")) - #t)) + "date --date='@0'")))) (add-after 'configure 'patch-settings (lambda _ ;; libnetcdf.settings contains the full filename of the compilers @@ -1901,8 +1905,11 @@ (define-public netcdf ;; store items. (substitute* "libnetcdf.settings" (("(/gnu/store/)([0-9A-Za-z]*)" all prefix hash) - (string-append prefix (string-take hash 10) "..."))) - #t))) + (string-append prefix (string-take hash 10) "..."))))) + (add-before 'check 'fix-test-rcmerge + (lambda _ + ;; Set HOME, to fix the test-rcmerge test. + (setenv "HOME" "/tmp")))) #:parallel-tests? #f)) ;various race conditions (home-page "https://www.unidata.ucar.edu/software/netcdf/") -- 2.38.1