[bug#31570] [PATCH 2/2] gnu: javacc: Bootstrap from javacc-4 instead of bootstrap binary.

[Alex Vong <alexvong1995@gmail.com>]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.1: 0002-gnu-javacc-Bootstrap-from-javacc-4-instead-of-bootst.patch --]
[-- Type: text/x-diff, Size: 1677 bytes --]

From 567852350ba03246253218e56d87e5ab13e4bfaf Mon Sep 17 00:00:00 2001
From: Alex Vong <alexvong1995@gmail.com>
Date: Thu, 24 May 2018 00:32:51 +0800
Subject: [PATCH 2/2] gnu: javacc: Bootstrap from javacc-4 instead of bootstrap
 binary.

* gnu/packages/java.scm (javacc)[arguments]: Use javacc-4, remove bootstrap
binary.
[native-inputs]: Add 'javacc-4'.
---
 gnu/packages/java.scm | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index c64313046..9ee795aba 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1910,13 +1910,21 @@ debugging, etc.")
                (base32
                 "111xc9mnmc5a6qz6x3xbhqc07y1lg2b996ggzw0hrblg42zya9xf"))))
     (arguments
-     `(#:test-target "test"
+     `(#:make-flags ; bootstrap from javacc-4
+       (list (string-append "-Dbootstrap-jar="
+                            (assoc-ref %build-inputs "javacc")
+                            "/share/java/javacc.jar"))
+       #:test-target "test"
        #:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'delete-bundled-libs
+         (add-after 'unpack 'delete-bundled-jars
            (lambda _
-             (delete-file-recursively "lib") #t))
-         (replace 'install (install-jars "target")))))))
+             (delete-file-recursively "bootstrap")
+             (delete-file-recursively "lib")
+             #t))
+         (replace 'install (install-jars "target")))))
+    (native-inputs
+     `(("javacc" ,javacc-4)))))
 
 ;; This is the last 3.x release of ECJ
 (define-public java-ecj-3
-- 
2.17.0


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 227 bytes --]