[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: gnu: ant-bootstrap: Make build more reliable.
From: |
Ricardo Wurmus |
Subject: |
01/01: gnu: ant-bootstrap: Make build more reliable. |
Date: |
Sun, 25 Mar 2018 18:02:42 -0400 (EDT) |
rekado pushed a commit to branch rhel6
in repository guix.
commit c4bcedd83823d0e30e56752311e3c143b124323e
Author: Ricardo Wurmus <address@hidden>
Date: Mon Mar 26 00:01:22 2018 +0200
gnu: ant-bootstrap: Make build more reliable.
* gnu/packages/java.scm (ant-bootstrap)[arguments]: Remove bootstrap phase;
create HOME/.ant.properties; pass options to JamVM.
---
gnu/packages/java.scm | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index d583577..d569a9d 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -212,6 +212,7 @@ JNI.")
`(#:tests? #f ; no "check" target
#:phases
(modify-phases %standard-phases
+ (delete 'bootstrap)
(delete 'configure)
(replace 'build
(lambda* (#:key inputs #:allow-other-keys)
@@ -226,6 +227,11 @@ JNI.")
(string-append (assoc-ref inputs "jamvm")
"/lib/rt.jar"))
+ ;; Ant complains if this file doesn't exist.
+ (setenv "HOME" "/tmp")
+ (with-output-to-file "/tmp/.ant.properties"
+ (lambda _ (display "")))
+
;; Use jikes instead of javac for <javac ...> tags in build.xml
(setenv "ANT_OPTS" "-Dbuild.compiler=jikes")
@@ -233,6 +239,11 @@ JNI.")
;; interesting, so we silence them.
(setenv "$BOOTJAVAC_OPTS" "-nowarn")
+ ;; Without these JamVM options the build may freeze.
+ (substitute* "bootstrap.sh"
+ (("^\"\\$\\{JAVACMD\\}\" " m)
+ (string-append m "-Xnocompact -Xnoinlining ")))
+
;; Disable tests because we are bootstrapping and thus don't have
;; any of the dependencies required to build and run the tests.
(substitute* "build.xml"