From patchwork Sun Jan 21 16:53:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sharlatan Hellseher X-Patchwork-Id: 59293 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 04C9527BBE9; Sun, 21 Jan 2024 16:56:17 +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_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL,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 B431727BBE2 for ; Sun, 21 Jan 2024 16:56:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rRb75-0004FL-9H; Sun, 21 Jan 2024 11:56:03 -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 1rRb73-0004Ea-Bq for guix-patches@gnu.org; Sun, 21 Jan 2024 11:56:01 -0500 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 1rRb72-0004cx-Im for guix-patches@gnu.org; Sun, 21 Jan 2024 11:56:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rRb74-0007js-4W; Sun, 21 Jan 2024 11:56:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68641] [PATCH 17/19] gnu: libpasastro: Use G-Expressions. Resent-From: Sharlatan Hellseher Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 21 Jan 2024 16:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68641 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68641@debbugs.gnu.org Cc: Sharlatan Hellseher , Andreas Enge , Efraim Flashner , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier , Sharlatan Hellseher Received: via spool by 68641-submit@debbugs.gnu.org id=B68641.170585611229653 (code B ref 68641); Sun, 21 Jan 2024 16:56:02 +0000 Received: (at 68641) by debbugs.gnu.org; 21 Jan 2024 16:55:12 +0000 Received: from localhost ([127.0.0.1]:38849 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRb6F-0007i9-Ch for submit@debbugs.gnu.org; Sun, 21 Jan 2024 11:55:11 -0500 Received: from mail-wm1-x329.google.com ([2a00:1450:4864:20::329]:48276) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rRb5W-0007bG-K7 for 68641@debbugs.gnu.org; Sun, 21 Jan 2024 11:54:27 -0500 Received: by mail-wm1-x329.google.com with SMTP id 5b1f17b1804b1-40ea5654271so13291375e9.0 for <68641@debbugs.gnu.org>; Sun, 21 Jan 2024 08:54:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705856057; x=1706460857; darn=debbugs.gnu.org; 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=9yy0TGFFzKwU0hUYL3lVVX5WkUXfNC/deKEXv77nMFI=; b=XBXF5+scffXEw6KYhZrdSV2JLrS7CqwyuqELMQZM7WPdcC6RJRkmBelVXXbb/Fckfa nCepTWU4neT/YfEnL1KvVLBi9NJvSJcWwM1XaR7TwAj66aMZBEk7nK/pzoUWksQZPOdw FA5tcN2WBrPWmDdmE9BgVX1DZL4N435n2QF97BKn0Z4z5iTyjBATqQY54+o7A3G4Gxsr id7NjsTuWifYolV3kFy77j+iqUMmoQULJhXAUFs3fQu14QDiyb1AiX2fGhPnhiV0SeGL XovEenpBHPHSKNr77QAx6UsDqSVwVipt7s8FPF0aybWH3Lu/37Jubh6Xm3NBbhJtPy2C e3ng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705856057; x=1706460857; 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=9yy0TGFFzKwU0hUYL3lVVX5WkUXfNC/deKEXv77nMFI=; b=Kz7kVyf8FoeTXnTY0fMV+oAUR3XOP6DfIenq0SGQHdCI/9wrvlvSCpXwOXiF8s4aM9 5eE2Tov7lnCSr1fB0uLEp9c65/JdgpEsO0R2NEHpQNquvBdmxgVy/srHJQD3S0b8A+sB x2+rGmViNNRv2xMhPkoG5hsouvwzZLIpbAAyHtBAOm0aq94c20g6L0KrKDV65Kyt2hM6 0+hPrEFTfsern2JmrdNfPpi+bCTJQfaUXOvcRZ5G9R/YE6Z55J7o8qdSWBmuv5lGrvyE G2WW5Kbc0aej4v3AcFiyb3ALZXL1WXKUAVFX1ylC6DoFj9BzTyxf8/dvsNFRANZDSrQ9 HLeA== X-Gm-Message-State: AOJu0YxCdry9xs7tzHyF9eU0bPwXMN/arOLgEzIm7uxTlXvu1kDdON6S a+F4bvRSQTcDI1VNesTqu+DE/o02q8zZaGnnSYLbBwHahHjYeAQyfAvvAvS2Sqc= X-Google-Smtp-Source: AGHT+IGfewvSkC9kbVB3ok48xFZz8GQEdllaD1Ul3ha3wDQ1nMMVVnmMhzGRlK//8LyDYtPQInRN6Q== X-Received: by 2002:a05:600c:5007:b0:40e:6963:e768 with SMTP id n7-20020a05600c500700b0040e6963e768mr1566015wmr.9.1705856057314; Sun, 21 Jan 2024 08:54:17 -0800 (PST) Received: from localhost.localdomain (cpc100856-bagu15-2-0-cust368.1-3.cable.virginm.net. [82.25.93.113]) by smtp.gmail.com with ESMTPSA id bi13-20020a05600c3d8d00b0040e8800fcf3sm16242222wmb.5.2024.01.21.08.54.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Jan 2024 08:54:16 -0800 (PST) From: Sharlatan Hellseher Date: Sun, 21 Jan 2024 16:53:57 +0000 Message-ID: X-Mailer: git-send-email 2.41.0 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 (libpasastro): [supported-systems]: Add it. [arguments]: Rewrite using G-expressions. [description]; Remove trailing \n. Change-Id: Ic0e79394be1110566f5481963fdd167985c1a770 --- gnu/packages/astronomy.scm | 41 ++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/gnu/packages/astronomy.scm b/gnu/packages/astronomy.scm index dd7473df49..c049e6e67f 100644 --- a/gnu/packages/astronomy.scm +++ b/gnu/packages/astronomy.scm @@ -3179,23 +3179,30 @@ (define-public libpasastro (sha256 (base32 "1na3gyb3nzb5gdgccs1653j2gnz6w3v1mqzhyhkx3yqw8bs3q5x0")))) (build-system gnu-build-system) + (supported-systems '("i686-linux" "x86_64-linux" + "armhf-linux" "aarch64-linux")) (arguments - `(#:tests? #f - #:make-flags - (list - ,(match (or (%current-target-system) (%current-system)) - ((or "aarch64-linux" "armhf-linux" "i686-linux" "x86_64-linux") - "OS_TARGET=linux") - (_ #f)) - ,(match (or (%current-target-system) (%current-system)) - ("i686-linux" "CPU_TARGET=i386") - ("x86_64-linux" "CPU_TARGET=x86_64") - ((or "armhf-linux" "aarch64-linux") "CPU_TARGET=armv7l") - (_ #f)) - (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (delete 'configure)))) + (list + #:tests? #f ; no tests provided + #:make-flags + #~(list + ;; Keep OS detection for the case when Hurd would be suitable to try. + #$@(if (target-linux?) '("OS_TARGET=linux") '()) + ;; Enable buildtime CPU detection where supported, + ;; and set a suitable CPU target variable. + #$@(match (or (%current-target-system) + (%current-system)) + ("i686-linux" + '("CPU_TARGET=i386")) + ("x86_64-linux" + '("CPU_TARGET=x86_64")) + ((or "armhf-linux" "aarch64-linux") + '("CPU_TARGET=armv7l")) + (_ '())) + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure)))) (home-page "https://github.com/pchev/libpasastro") (synopsis "Interface to astronomy library for use from Pascal program") (description @@ -3207,7 +3214,7 @@ (define-public libpasastro @item @code{libpasplan404.so}: Interface with Plan404 to compute planets position. @item @code{libpaswcs.so}: Interface with libwcs to work with FITS WCS. @item @code{libpasspice.so}: To work with NAIF/SPICE kernel. -@end itemize\n") +@end itemize") (license license:gpl2+))) (define-public libxisf