From patchwork Fri Apr 29 11:55:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Paul A. Patience" X-Patchwork-Id: 2093 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 CF34427BBEA; Fri, 29 Apr 2022 12:56:15 +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 3FC1627BBE9 for ; Fri, 29 Apr 2022 12:56:15 +0100 (BST) Received: from localhost ([::1]:33050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nkPEM-0006ck-C1 for patchwork@mira.cbaines.net; Fri, 29 Apr 2022 07:56:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52292) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nkPEA-0006ar-V9 for guix-patches@gnu.org; Fri, 29 Apr 2022 07:56:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:57130) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nkPEA-00044R-M1 for guix-patches@gnu.org; Fri, 29 Apr 2022 07:56:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nkPEA-0000jB-Ff for guix-patches@gnu.org; Fri, 29 Apr 2022 07:56:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55182] [PATCH 1/3] gnu: apl: Update to 1.8-r1550. Resent-From: "Paul A. Patience" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Apr 2022 11:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55182 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55182@debbugs.gnu.org Cc: "Paul A. Patience" X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16512333342750 (code B ref -1); Fri, 29 Apr 2022 11:56:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Apr 2022 11:55:34 +0000 Received: from localhost ([127.0.0.1]:51027 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nkPDc-0000i6-CA for submit@debbugs.gnu.org; Fri, 29 Apr 2022 07:55:34 -0400 Received: from lists.gnu.org ([209.51.188.17]:41164) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nkPDb-0000hy-2a for submit@debbugs.gnu.org; Fri, 29 Apr 2022 07:55:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52162) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nkPDZ-0005xK-Cb for guix-patches@gnu.org; Fri, 29 Apr 2022 07:55:26 -0400 Received: from mail-4022.proton.ch ([185.70.40.22]:39818) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nkPDT-0003oe-82 for guix-patches@gnu.org; Fri, 29 Apr 2022 07:55:23 -0400 Date: Fri, 29 Apr 2022 11:55:05 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=apatience.com; s=protonmail2; t=1651233308; bh=DDnqyZTq5mNisFDTy9qH36DuWGMAV8vzBtDuogppDJ0=; h=Date:To:From:Cc:Reply-To:Subject:Message-ID:Feedback-ID:From:To: Cc:Date:Subject:Reply-To:Feedback-ID:Message-ID; b=THQNFemZTJIzY0lpQYIl4ZGqI1qciGaZTruvyTi4+Duh8Dk1aS1D/D7VmcUZiAyOH LD5fuIPpzDu2J2xSt0x77JbLHujoGEY2mN9bxiGA1Rz7jcJLViW+XxqnxfsmbRiQ8w I4X2HhGFMcGJhKY7pyUDtRbluPmYIsaMNSRy/jb1Ix7fhyCnS45ICSjbRVhEQ2b8ig QVfHts+yNVNmy8byOeHxPuxLYE2f00XipEKQ4OkW1Wr5B7aZbjvESJMnwNJZZnbRcw +dnFI5nOaJjrjSOVj9bkrG6oMnO2HkeqMB6okle0GnbpnUFgrFrOnJQPAYKrlFcBIj IvwbJgnNeFnsA== From: "Paul A. Patience" Message-ID: <20220429115456.539028-1-paul@apatience.com> Feedback-ID: 19227857:user:proton MIME-Version: 1.0 Received-SPF: pass client-ip=185.70.40.22; envelope-from=paul@apatience.com; helo=mail-4022.proton.ch X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Reply-To: "Paul A. Patience" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This commit fixes a failing build caused by -Werror (the configure script no longer sets the -Werror compilation flag). It also ensures no build information is leaked (through GNU APL's --show_src_dir and --show_all_dirs flags). * gnu/packages/apl.scm (apl): Update to 1.8-r1550. [arguments]: Add 'fix-configure' phase. [license]: Prefix with 'license:'. --- gnu/packages/apl.scm | 76 ++++++++++++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 28 deletions(-) -- 2.36.0 diff --git a/gnu/packages/apl.scm b/gnu/packages/apl.scm index badec04333..485d3aa296 100644 --- a/gnu/packages/apl.scm +++ b/gnu/packages/apl.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013 Nikita Karetnikov ;;; Copyright © 2014, 2015 Mark H Weaver ;;; Copyright © 2017, 2019 Efraim Flashner +;;; Copyright © 2022 Paul A. Patience ;;; ;;; This file is part of GNU Guix. ;;; @@ -19,9 +20,10 @@ ;;; along with GNU Guix. If not, see . (define-module (gnu packages apl) - #:use-module (guix licenses) + #:use-module ((guix licenses) #:prefix license:) + #:use-module (guix git-download) + #:use-module (guix svn-download) #:use-module (guix packages) - #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (gnu packages gettext) #:use-module (gnu packages maths) @@ -30,30 +32,48 @@ (define-module (gnu packages apl) #:use-module (gnu packages sqlite)) (define-public apl - (package - (name "apl") - (version "1.8") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnu/apl/apl-" version ".tar.gz")) - (sha256 - (base32 - "1jxvv2h3y1am1fw6r5sn3say1n0dj8shmscbybl0qhqdia2lqkql")))) - (build-system gnu-build-system) - (home-page "https://www.gnu.org/software/apl/") - (inputs - `(("gettext" ,gettext-minimal) - ("lapack" ,lapack) - ("pcre" ,pcre2) - ("sqlite" ,sqlite) - ("readline" ,readline))) - (arguments - `(#:configure-flags (list (string-append - "--with-sqlite3=" - (assoc-ref %build-inputs "sqlite"))))) - (synopsis "APL interpreter") - (description - "GNU APL is a free interpreter for the programming language APL. It is + (let ((revision 1550)) + (package + (name "apl") + (version (string-append "1.8-r" (number->string revision))) + (source + (origin + (method svn-fetch) + (uri (svn-reference + (url "svn://svn.savannah.gnu.org/apl/trunk") + (revision revision))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1bgc3a09f35zrqq2irhm1hspppnxjqas0fmcw14hkc7910br9ip3")))) + (build-system gnu-build-system) + (home-page "https://www.gnu.org/software/apl/") + (inputs + `(("gettext" ,gettext-minimal) + ("lapack" ,lapack) + ("pcre" ,pcre2) + ("sqlite" ,sqlite) + ("readline" ,readline))) + (arguments + `(#:configure-flags (list (string-append + "--with-sqlite3=" + (assoc-ref %build-inputs "sqlite"))) + #:phases + (modify-phases %standard-phases + (add-before 'configure 'fix-configure + (lambda _ + (substitute* "buildtag.sh" + ;; Don't exit on failed SVN-related calls. + (("^ +return 0\n") "") + ;; Manually set the SVN revision, since the directory is + ;; unversioned and we know it anyway. + (("^SVNINFO=.*") + ,(string-append "SVNINFO=" (number->string revision) "\n")) + ;; Requires running ‘svn info’ on a versioned directory. + (("\\\\\"\\$ARCHIVE_SVNINFO\\\\\"") "\\\"\\\"") + ;; Don't leak build information. + (("\\\\\"\\$abs_srcdir\\\\\"") "\\\"\\\""))))))) + (synopsis "APL interpreter") + (description + "GNU APL is a free interpreter for the programming language APL. It is an implementation of the ISO standard 13751.") - (license gpl3+))) + (license license:gpl3+))))