From patchwork Tue Sep 17 13:51:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Carlo Zancanaro X-Patchwork-Id: 15401 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 033B2173EF; Tue, 17 Sep 2019 14:52:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 89C46173ED for ; Tue, 17 Sep 2019 14:52:25 +0100 (BST) Received: from localhost ([::1]:46372 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iADu4-0003fg-Pm for patchwork@mira.cbaines.net; Tue, 17 Sep 2019 09:52:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47997) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iADtl-0003Qw-AR for guix-patches@gnu.org; Tue, 17 Sep 2019 09:52:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iADtj-0004QC-J5 for guix-patches@gnu.org; Tue, 17 Sep 2019 09:52:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43040) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iADtj-0004Q3-F3 for guix-patches@gnu.org; Tue, 17 Sep 2019 09:52:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iADtj-0003WR-9y for guix-patches@gnu.org; Tue, 17 Sep 2019 09:52:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#37439] [PATCH] Add abcl. Resent-From: Carlo Zancanaro Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 17 Sep 2019 13:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 37439 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 37439@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.156872831913528 (code B ref -1); Tue, 17 Sep 2019 13:52:02 +0000 Received: (at submit) by debbugs.gnu.org; 17 Sep 2019 13:51:59 +0000 Received: from localhost ([127.0.0.1]:51861 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iADtY-0003W2-MS for submit@debbugs.gnu.org; Tue, 17 Sep 2019 09:51:59 -0400 Received: from lists.gnu.org ([209.51.188.17]:50822) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iADtR-0003Vp-Hw for submit@debbugs.gnu.org; Tue, 17 Sep 2019 09:51:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47936) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iADtP-0003Af-FB for guix-patches@gnu.org; Tue, 17 Sep 2019 09:51:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iADtN-0004HE-Qv for guix-patches@gnu.org; Tue, 17 Sep 2019 09:51:43 -0400 Received: from zancanaro.com.au ([45.76.117.151]:33582) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iADtN-0004Fx-4g for guix-patches@gnu.org; Tue, 17 Sep 2019 09:51:41 -0400 Received: by zancanaro.com.au (Postfix, from userid 116) id 8FD3629DCE; Tue, 17 Sep 2019 13:51:37 +0000 (UTC) Received: from jolteon (210-1-202-160-cpe.spintel.net.au [210.1.202.160]) by zancanaro.com.au (Postfix) with ESMTPSA id 189CD29DCC for ; Tue, 17 Sep 2019 13:51:34 +0000 (UTC) References: <87sgovrtr9.fsf@zancanaro.id.au> User-agent: mu4e 1.2.0; emacs 26.3 From: Carlo Zancanaro In-reply-to: <87sgovrtr9.fsf@zancanaro.id.au> Date: Tue, 17 Sep 2019 23:51:33 +1000 Message-ID: <87r24frpy2.fsf@zancanaro.id.au> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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" X-getmail-retrieved-from-mailbox: Patches On Tue, Sep 17 2019, Carlo Zancanaro wrote: > Here's another patch! ... Soon after sending the patch I realised that I hadn't run it with --check. It turns out it wasn't reproducible, so I've attached an updated patch that fixes that, and the long line warning from 'guix lint'. Carlo From 0e35319f9df5e91bc6fb07224122109508a85244 Mon Sep 17 00:00:00 2001 From: Carlo Zancanaro Date: Tue, 17 Sep 2019 22:01:01 +1000 Subject: [PATCH] gnu: Add abcl. * gnu/packages/java.scm (abcl): New variable. * gnu/packages/patches/abcl-fix-build-xml.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/java.scm | 66 ++++++++++++++++++- gnu/packages/patches/abcl-fix-build-xml.patch | 50 ++++++++++++++ 3 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/abcl-fix-build-xml.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3f32b9cbf2..a0307b5e23 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -669,6 +669,7 @@ dist_patch_DATA = \ %D%/packages/patches/a2ps-CVE-2001-1593.patch \ %D%/packages/patches/a2ps-CVE-2014-0466.patch \ %D%/packages/patches/a2ps-CVE-2015-8107.patch \ + %D%/packages/patches/abcl-fix-build-xml.patch \ %D%/packages/patches/abiword-explictly-cast-bools.patch \ %D%/packages/patches/abiword-black-drawing-with-gtk322.patch \ %D%/packages/patches/acl-fix-perl-regex.patch \ diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 403c446a82..6090dcd514 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ricardo Wurmus ;;; Copyright © 2016 Leo Famulari ;;; Copyright © 2016, 2017 Roel Janssen -;;; Copyright © 2017 Carlo Zancanaro +;;; Copyright © 2017, 2019 Carlo Zancanaro ;;; Copyright © 2017, 2018 Julien Lepiller ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2016, 2017, 2018 Alex Vong @@ -11109,3 +11109,67 @@ network protocols, and core version control algorithms.") `(("java-javaewah" ,java-javaewah) ("java-jsch" ,java-jsch) ("java-slf4j-api" ,java-slf4j-api))))) + +(define-public abcl + (package + (name "abcl") + (version "1.5.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://abcl.org/releases/" + version "/abcl-src-" version ".tar.gz")) + (sha256 + (base32 + "1hhvcg050nfpjbdmskc1cv2j38qi6qfl77a61b5cxx576kbff3lj")) + (patches + (search-patches + "abcl-fix-build-xml.patch")))) + (build-system ant-build-system) + (native-inputs + `(("java-junit" ,java-junit))) + (arguments + `(#:build-target "abcl.jar" + #:test-target "abcl.test" + #:phases + (modify-phases %standard-phases + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let ((share (string-append (assoc-ref outputs "out") + "/share/java/")) + (bin (string-append (assoc-ref outputs "out") + "/bin/"))) + (mkdir-p share) + (install-file "dist/abcl.jar" share) + (install-file "dist/abcl-contrib.jar" share) + (mkdir-p bin) + (with-output-to-file (string-append bin "abcl") + (lambda _ + (let ((classpath (string-append + share "abcl.jar" + ":" + share "abcl-contrib.jar"))) + (display (string-append + "#!" (which "sh") "\n" + "if [[ -z $CLASSPATH ]]; then\n" + " cp=\"" classpath "\"\n" + "else\n" + " cp=\"" classpath ":$CLASSPATH\"\n" + "fi\n" + "exec " (which "java") + " -cp $cp org.armedbear.lisp.Main $@\n"))))) + (chmod (string-append bin "abcl") #o755) + #t)))))) + (home-page "https://abcl.org/") + (synopsis "Common Lisp Implementation on the JVM") + (description + "@dfn{Armed Bear Common Lisp} (ABCL) is a full implementation of the Common +Lisp language featuring both an interpreter and a compiler, running in the +JVM. It supports JSR-223 (Java scripting API): it can be a scripting engine +in any Java application. Additionally, it can be used to implement (parts of) +the application using Java to Lisp integration APIs.") + (license (list license:gpl2+ + ;; named-readtables is released under 3 clause BSD + license:bsd-3 + ;; jfli is released under CPL 1.0 + license:cpl1.0)))) diff --git a/gnu/packages/patches/abcl-fix-build-xml.patch b/gnu/packages/patches/abcl-fix-build-xml.patch new file mode 100644 index 0000000000..dd315b4271 --- /dev/null +++ b/gnu/packages/patches/abcl-fix-build-xml.patch @@ -0,0 +1,50 @@ +ABCL's build calls the hostname command, and needs the internet to download +JUnit. Neither of these are really required, though, so we can patch them out +to make it build. + +We also remove the Implemetation-Build property that ends up in the manifest +file, because it stores information about the time of the build, which makes +it non-deterministic. + +--- a/build.xml ++++ b/build.xml +@@ -327,7 +327,7 @@ from ${abcl.home.dir} + + ++ depends="abcl.compile,abcl.stamp.version"> + + +@@ -455,11 +455,6 @@ from ${abcl.home.dir} + value="${abcl.version}-${abcl.version.src}"/> + + +- +- +- abcl.hostname: ${abcl.hostname} +- +- + + + +@@ -500,8 +495,6 @@ from ${abcl.home.dir} + value="ABCL"/> + +- + + + +@@ -1019,8 +1012,7 @@ ${basedir}/../cl-bench + + + +- ++ + +