From patchwork Wed Jun 21 06:33:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 51131 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 8AF6D27BBE9; Wed, 21 Jun 2023 07:38:00 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, 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 D2EAA27BBEB for ; Wed, 21 Jun 2023 07:37:58 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qBrRL-0001iT-NQ; Wed, 21 Jun 2023 02:35:39 -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 1qBrR5-0001e6-L2 for guix-patches@gnu.org; Wed, 21 Jun 2023 02:35:31 -0400 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 1qBrQl-00066M-AE for guix-patches@gnu.org; Wed, 21 Jun 2023 02:35:15 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qBrQk-0007im-EF; Wed, 21 Jun 2023 02:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64201] [PATCH 01/20] gnu: sextractor: Update to 2.28.0, fix build. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Wed, 21 Jun 2023 06:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64201@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 64201-submit@debbugs.gnu.org id=B64201.168732925129383 (code B ref 64201); Wed, 21 Jun 2023 06:35:02 +0000 Received: (at 64201) by debbugs.gnu.org; 21 Jun 2023 06:34:11 +0000 Received: from localhost ([127.0.0.1]:60333 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBrPu-0007dp-Uw for submit@debbugs.gnu.org; Wed, 21 Jun 2023 02:34:11 -0400 Received: from mail-wr1-f45.google.com ([209.85.221.45]:61754) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qBrPs-0007dJ-JE for 64201@debbugs.gnu.org; Wed, 21 Jun 2023 02:34:09 -0400 Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-31122c346f4so6235399f8f.3 for <64201@debbugs.gnu.org>; Tue, 20 Jun 2023 23:34:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687329242; x=1689921242; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lCbWjuT0HXWjZLz/98bOxqfgn/LstVc7f4YjxsmYdoI=; b=ml5MUstTL5HxumyYEzgo7RjPC6BCfmL9zxqU4uEzt4CsvYlCf9WcgP+t9zTvplnXWS 8RaIpjOxidvD9BmvyRA8u6oO9FHDgvBgdq0K4ne+S4St2FLN+6goJOYKFLyK7gj7mt3v LUYbi7pQM+D2EY8XkozbmW7Ne76IFpiD2pcMuQR7E+tJ0mtV4r6XGf5UzSq5/zMeczgK pUTFfidHhmccQNe2r6kdVz/S/W637wwW0/vUEQMa77EwUsHp1Ea/633Rs7ghjSqT8Kno 6VnyHjm0LnSMPHIqfZh4F1mXoWikPN1qFec1mnxKEk1fPN2uVV7kPoQNIDGEb8bSh5WY LgxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687329242; x=1689921242; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lCbWjuT0HXWjZLz/98bOxqfgn/LstVc7f4YjxsmYdoI=; b=dGt27gkM+DaqoVjalakE8lFgjWhr5YLYPw6xeHLDKu2WF/ePeG8D0u8GHFiQl/SoMe UqPDiXrkWzrHyF+jjBQd3/n/Da18ww9C0WLHOUcyuX/xWUoS5wHDPOIc8NOqEd1yeMr6 zKJdsnSpSLRvXg1UEvolhnL5fTcm7/41nVWn4AuZExSTpirqD9YjbmSnC2SX6Jef6Qyx FYilnASYWwrvnEPWUpqNwvnb3LzAhbOlxkEXgluN92W47xnKHAApL/LnPxcZoTN4PdyO oRd4LiJd8WcH2+gDyjhEAsIhk6v4WRbvKd0FCYfeiHZnQSmDEpg4cGLHX7f7KVF5m6VD qThA== X-Gm-Message-State: AC+VfDwqrB0Tw7E6Hr42uZt0dFOlUy7knf+vU9Alm+bqWRvfIHykazKP RLs01Z7dm+GpS/ZOvq8o4ODuh2aFLWA= X-Google-Smtp-Source: ACHHUZ4mFCioL2hmofJIs/tJi2FwfTITeC0VGPfAT+h4fQebvSCTXk2QMcCCHx2bfzTmMbIuY92Jdw== X-Received: by 2002:a5d:568a:0:b0:30a:eac8:e5c1 with SMTP id f10-20020a5d568a000000b0030aeac8e5c1mr13510290wrv.6.1687329242381; Tue, 20 Jun 2023 23:34:02 -0700 (PDT) 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 r15-20020a5d52cf000000b0030af72bca98sm3553471wrv.103.2023.06.20.23.34.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 23:34:01 -0700 (PDT) From: Sharlatan Hellseher Date: Wed, 21 Jun 2023 07:33:40 +0100 Message-Id: <37f2b71e03baa80f6af3d6b8fdb9fa0424418ca5.1687302523.git.sharlatanus@gmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: 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 * gnu/packages/astronomy.scm (sextractor): Update to 2.28.0, fix build. [arguments]: Use G-expressions, add configure flags for CFitsio detection. [inputs]: Remove labels. Add cfitsio. --- gnu/packages/astronomy.scm | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index cdb6750f09..787ca01491 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -747,7 +747,7 @@ (define-public phd2 (define-public sextractor (package (name "sextractor") - (version "2.25.0") + (version "2.28.0") (source (origin (method git-fetch) @@ -756,29 +756,33 @@ (define-public sextractor (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0q69n3nyal57h3ik2xirwzrxzljrwy9ivwraxzv9566vi3n4z5mw")))) + (base32 "15v7brjiraj2rdyxiidcgb58b3dqzdd363j31cjrfqhd1wc8ii5j")))) (build-system gnu-build-system) ;; NOTE: (Sharlatan-20210124T103117+0000): Building with `atlas' is failing ;; due to missing shared library which required on configure phase. Switch ;; build to use `openblas' instead. It requires FFTW with single precision ;; `fftwf'. (arguments - `(#:configure-flags - (list - "--enable-openblas" - (string-append - "--with-openblas-libdir=" (assoc-ref %build-inputs "openblas") "/lib") - (string-append - "--with-openblas-incdir=" (assoc-ref %build-inputs "openblas") "/include") - (string-append - "--with-fftw-libdir=" (assoc-ref %build-inputs "fftw") "/lib") - (string-append - "--with-fftw-incdir=" (assoc-ref %build-inputs "fftw") "/include")))) + (list + #:configure-flags + #~(list + "--enable-openblas" + (string-append "--with-cfitsio-incdir=" + #$(this-package-input "cfitsio") "/include") + (string-append "--with-cfitsio-libdir=" + #$(this-package-input "cfitsio") "/lib") + (string-append "--with-fftw-incdir=" + #$(this-package-input "fftwf") "/include") + (string-append "--with-fftw-libdir=" + #$(this-package-input "fftwf") "/lib") + (string-append "--with-openblas-incdir=" + #$(this-package-input "openblas") "/include") + (string-append "--with-openblas-libdir=" + #$(this-package-input "openblas") "/lib")))) (native-inputs (list autoconf automake libtool)) (inputs - `(("openblas" ,openblas) - ("fftw" ,fftwf))) + (list cfitsio fftwf openblas)) (home-page "https://www.astromatic.net/software/sextractor") (synopsis "Extract catalogs of sources from astronomical images") (description