05/11: gnu: ecj-bootstrap: Build with JamVM 1.5.1 and jikes.

[Ricardo Wurmus]

rekado pushed a commit to branch rhel6
in repository guix.

commit 4961eb4e007c41506173946096e3ddf072ac74da
Author: Ricardo Wurmus <address@hidden>
Date:   Sun Mar 25 19:34:13 2018 +0200

    gnu: ecj-bootstrap: Build with JamVM 1.5.1 and jikes.
    
    * gnu/packages/java.scm (ecj-bootstrap)[native-inputs]: Replace "sablevm" 
with
    "jikes" and "jamvm-1-bootstrap".
    [arguments]: Adjust accordingly.
---
 gnu/packages/java.scm | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index ce8c059..ea657b8 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -379,9 +379,12 @@ build process and its dependencies, whereas Make uses 
Makefile format.")
            (lambda* (#:key inputs #:allow-other-keys)
              (setenv "CLASSPATH"
                      (string-join
-                      (find-files (string-append (assoc-ref inputs 
"ant-bootstrap")
-                                                 "/lib")
-                                  "\\.jar$")
+                      (cons (string-append (assoc-ref inputs "jamvm")
+                                           "/lib/rt.jar")
+                            (find-files (string-append
+                                         (assoc-ref inputs "ant-bootstrap")
+                                         "/lib")
+                                        "\\.jar$"))
                       ":"))
              #t))
          (replace 'build
@@ -396,7 +399,7 @@ build process and its dependencies, whereas Make uses 
Makefile format.")
 Main-Class: org.eclipse.jdt.internal.compiler.batch.Main\n")))
 
              ;; Compile it all!
-             (and (zero? (apply system* "javac-sablevm"
+             (and (zero? (apply system* "jikes"
                                 (find-files "." "\\.java$")))
                   (zero? (system* "fastjar" "cvfm"
                                   "ecj-bootstrap.jar" "manifest" ".")))))
@@ -410,7 +413,8 @@ Main-Class: 
org.eclipse.jdt.internal.compiler.batch.Main\n")))
     (native-inputs
      `(("ant-bootstrap" ,ant-bootstrap)
        ("unzip" ,unzip)
-       ("sablevm" ,sablevm)
+       ("jikes" ,jikes)
+       ("jamvm" ,jamvm-1-bootstrap)
        ("fastjar" ,fastjar)))
     (home-page "https://eclipse.org";)
     (synopsis "Eclipse Java development tools core batch compiler")