From patchwork Sun Dec 11 22:25:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 45177 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 CCF7827BBEC; Sun, 11 Dec 2022 22:26:22 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, PDS_OTHER_BAD_TLD,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 EDE1827BBE9 for ; Sun, 11 Dec 2022 22:26:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p4Ulo-0005DL-Ff; Sun, 11 Dec 2022 17:26:04 -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 1p4Uln-0005Bi-6r for guix-patches@gnu.org; Sun, 11 Dec 2022 17:26:03 -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 1p4Ulm-0004D0-Gr for guix-patches@gnu.org; Sun, 11 Dec 2022 17:26:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p4Ulm-0003xs-D4 for guix-patches@gnu.org; Sun, 11 Dec 2022 17:26:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59978] [PATCH 1/6] gnu: cfitsio: Update to 4.2.0. References: <20221211222330.32212-1-sharlatanus@gmail.com> In-Reply-To: <20221211222330.32212-1-sharlatanus@gmail.com> Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 11 Dec 2022 22:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59978 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59978@debbugs.gnu.org Cc: Sharlatan Hellseher Received: via spool by 59978-submit@debbugs.gnu.org id=B59978.167079756015218 (code B ref 59978); Sun, 11 Dec 2022 22:26:02 +0000 Received: (at 59978) by debbugs.gnu.org; 11 Dec 2022 22:26:00 +0000 Received: from localhost ([127.0.0.1]:48558 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4Ulh-0003x5-K8 for submit@debbugs.gnu.org; Sun, 11 Dec 2022 17:26:00 -0500 Received: from mail-wm1-f48.google.com ([209.85.128.48]:44012) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p4Ulf-0003wk-Ar for 59978@debbugs.gnu.org; Sun, 11 Dec 2022 17:25:55 -0500 Received: by mail-wm1-f48.google.com with SMTP id k22-20020a05600c1c9600b003d1ee3a6289so3730831wms.2 for <59978@debbugs.gnu.org>; Sun, 11 Dec 2022 14:25:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=k65IQ9fy6bzsDx1zf4A5YiOSYGLipuEf7/7WTRh0Qzc=; b=ObZwQH+bOYwnWp8L0H7dmSkZvMIgHi5MIHX10g7uqEAkGNSjsB6Bx/zo6ISTzBNNIP pT4INP651NRQvOpjI+nvHECFm1PKOYZK3UZv8eKRs7dN/FoxLHyISu6OsxMF1kAk+QmA MTFgafjkLHk8inVkuIIBzQPfuYnZ1ULbHAjpQsnGiIOn0WvQw7r1lJ6ZaBjArS3xprI6 ZKTHxM02tucOpQQsSn17A4IRmsLolSDYIGv7yiXVuh5R0JVsRY2a8sSPisg4ADGi3ahH N7InUd3R7b+IDeOTUm1Cv5aRqnVPPrR1M+iP+KRzLx/yr4XflRGb8teQOwip7kT6fFfm a/0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=k65IQ9fy6bzsDx1zf4A5YiOSYGLipuEf7/7WTRh0Qzc=; b=d82YmuHxI4nV6iwYwRZFZOp2KXIOcPqFJBgS216qIxOC50d7glyzqO9aoz7m92Cpe2 GcD01R6it+ud0XlryYg0aHLGzmlkqnaxO99RuXnei0EYU1tEaw8b57R+doTdpo6qtPdp zfrpQiA5DguTxae4byaK6Zro7UCllKa3cFi7MQQL7R/ghor7XY01MzF/+SYWtEHR4lki CSlI/4jSlPPS561d/Cup9oKqbjVY3Ry4oaVNjRVTXSdZrzDvExdCu2vGgxkqhw8H/ahG ST9KJDnURWtD7alUB2cr959vlXe9awSGymiI2QenwaWlMHBpSYLIEY56zT2zQYWVJFBh 86Pw== X-Gm-Message-State: ANoB5pm849M1FAiGvmUh4mtLx2rbSJKZfx8O4+o0E55nW+wRyWnsopsN UWdKV1twZfgjMyQhgxIg11AgOzHvhnM= X-Google-Smtp-Source: AA0mqf7dj0z4fd6ATClfctietR/x1j6rZRGmt8wNQYK4SttXdhzuFlUWMNnnWm2BYQ3h3oMF756Lnw== X-Received: by 2002:a05:600c:3d98:b0:3d0:a31b:ca32 with SMTP id bi24-20020a05600c3d9800b003d0a31bca32mr10530256wmb.1.1670797549298; Sun, 11 Dec 2022 14:25:49 -0800 (PST) Received: from guxtil.incerto.xyz (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id r11-20020a05600c424b00b003d1e34bcbb2sm6758967wmm.13.2022.12.11.14.25.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Dec 2022 14:25:48 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 11 Dec 2022 22:25:40 +0000 Message-Id: <20221211222545.32318-1-sharlatanus@gmail.com> X-Mailer: git-send-email 2.38.1 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 Fix build on aarch64-linux as reported in: - https://issues.guix.gnu.org/59323 - https://github.com/rwesson/ALFA/issues/29 The latest version passed build on aarch64-linux system with curl and gfortran enabled. wcslib@7.5 passed build with curl enabled (was marked as failing in cements). * gnu/packages/astronomy.scm (cfitsio): Update to 4.2.0. [arguments]: Use Gexp, enable tests. [arguments](phases): Delete check and add post-install-check phases. [native-inputs]: Add gfortran. [inputs]: Add curl, zlib. --- gnu/packages/astronomy.scm | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index c59f4d02a4..8d9cce5158 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -356,7 +356,7 @@ (define-public casacore (define-public cfitsio (package (name "cfitsio") - (version "3.49") + (version "4.2.0") (source (origin (method url-fetch) @@ -364,18 +364,27 @@ (define-public cfitsio "http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/" "cfitsio-" version ".tar.gz")) (sha256 - (base32 "1cyl1qksnkl3cq1fzl4dmjvkd6329b57y9iqyv44wjakbh6s4rav")))) + (base32 "128qsv2q0f0g714ahlsixiikvvbwxi9bg9q9pcr5cd3f7wdkv9gb")))) (build-system gnu-build-system) - ;; XXX Building with curl currently breaks wcslib. It doesn't use - ;; pkg-config and hence won't link with -lcurl. (arguments - `(#:tests? #f ; no tests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-paths - (lambda _ - (substitute* "Makefile.in" (("/bin/") "")) - #t))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda _ + (substitute* "Makefile.in" (("/bin/") "")))) + (delete 'check) + ;; TODO: Testing steps are sourced from docs/fitsio.pdf, implement + ;; the logic in Guile in the future. + (add-after 'install 'post-install-check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "make" "testprog") + (with-output-to-file "testprog.lis" (lambda _(invoke "./testprog"))) + (invoke "diff" "-r" "testprog.lis" "testprog.out") + (invoke "cmp" "-l" "testprog.fit" "testprog.std"))))))) + (native-inputs (list gfortran)) + (inputs (list curl zlib)) (home-page "https://heasarc.gsfc.nasa.gov/fitsio/fitsio.html") (synopsis "Library for reading and writing FITS files") (description "CFITSIO provides simple high-level routines for reading and @@ -384,7 +393,7 @@ (define-public cfitsio provides many advanced features for manipulating and filtering the information in FITS files.") (license (license:non-copyleft "file://License.txt" - "See License.txt in the distribution.")))) + "See License.txt in the distribution.")))) (define-public python-fitsio (package