[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
23/35: gnu: ant-bootstrap: Bind OUTPUTS in build phase.
From: |
guix-commits |
Subject: |
23/35: gnu: ant-bootstrap: Bind OUTPUTS in build phase. |
Date: |
Sat, 18 Dec 2021 11:35:12 -0500 (EST) |
rekado pushed a commit to branch wip-java-bootstrap-simplify
in repository guix.
commit d04bf1e9198a0eb499308766558aeaeed1ee3ebf
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Sat Dec 18 17:25:28 2021 +0100
gnu: ant-bootstrap: Bind OUTPUTS in build phase.
* gnu/packages/java.scm (ant-bootstrap)[arguments]: Bind OUTPUTS to remove
reference to global %OUTPUTS.
---
gnu/packages/java.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index cd14bfb..089c720 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -359,7 +359,7 @@ JNI.")
(setenv "JAVAC" (search-input-file inputs "/bin/jikes"))
(setenv "CLASSPATH" (search-input-file inputs "/lib/rt.jar"))))
(replace 'build
- (lambda* (#:key inputs #:allow-other-keys)
+ (lambda* (#:key inputs outputs #:allow-other-keys)
;; Ant complains if this file doesn't exist.
(setenv "HOME" "/tmp")
(with-output-to-file "/tmp/.ant.properties"
@@ -386,7 +386,7 @@ JNI.")
(("depends=\"jars,test-jar\"") "depends=\"jars\""))
(invoke "bash" "bootstrap.sh"
(string-append "-Ddist.dir="
- (assoc-ref %outputs "out")))))
+ (assoc-ref outputs "out")))))
(add-after 'build 'strip-jar-timestamps ;based on ant-build-system
(lambda* (#:key outputs #:allow-other-keys)
(define (repack-archive jar)
- 06/35: gnu: ecj-javac-wrapper-final: Use Guile 3., (continued)
- 06/35: gnu: ecj-javac-wrapper-final: Use Guile 3., guix-commits, 2021/12/18
- 11/35: gnu: icedtea-7: Run tests conditionally., guix-commits, 2021/12/18
- 05/35: gnu: ecj-javac-wrapper: Use Guile 3., guix-commits, 2021/12/18
- 10/35: gnu: Add jamvm-with-ecj4., guix-commits, 2021/12/18
- 09/35: gnu: Add ecj4-javac-wrapper., guix-commits, 2021/12/18
- 17/35: gnu: icedtea-8: Remove commented configure flag., guix-commits, 2021/12/18
- 15/35: gnu: icedtea-7: Import missing module for read-line., guix-commits, 2021/12/18
- 13/35: gnu: icedtea-7: Bind INPUTS in 'patch-paths build phase., guix-commits, 2021/12/18
- 14/35: gnu: icedtea-7: Use system lcms and pcsc., guix-commits, 2021/12/18
- 20/35: gnu: icedtea-8: Simplify source snippet., guix-commits, 2021/12/18
- 23/35: gnu: ant-bootstrap: Bind OUTPUTS in build phase.,
guix-commits <=
- 24/35: gnu: ant-bootstrap: Remove trailing #T from build phase., guix-commits, 2021/12/18
- 19/35: gnu: icedtea-8: Remove trailing #T from build phases., guix-commits, 2021/12/18
- 21/35: gnu: icedtea-8: Update to 3.19.0., guix-commits, 2021/12/18
- 22/35: gnu: jamvm-1-bootstrap: Simplify snippet., guix-commits, 2021/12/18
- 25/35: gnu: ecj-bootstrap: Remove trailing #T., guix-commits, 2021/12/18
- 26/35: gnu: ecj-bootstrap: Remove #:modules from arguments., guix-commits, 2021/12/18
- 30/35: gnu: classpath-bootstrap: Use label-less input style., guix-commits, 2021/12/18
- 31/35: gnu: jamvm-1-bootstrap: Use label-less input style., guix-commits, 2021/12/18
- 34/35: gnu: classpath-0.99: Use label-less input style., guix-commits, 2021/12/18
- 08/35: gnu: Add ecj4-bootstrap., guix-commits, 2021/12/18