diff mbox series

[bug#38321] gnu: java: Remove precompiled blobs.

Message ID 20191122110747.3484981-1-andrius@stikonas.eu
State Accepted
Headers show
Series [bug#38321] gnu: java: Remove precompiled blobs. | expand

Commit Message

ashish.is--- via Guix-patches" via Nov. 22, 2019, 11:07 a.m. UTC 
* gnu/packages/java.scm (jamvm-1-bootstrap): Remove prebuilt classes.zip
* gnu/packages/java.scm (jamvm): Remove prebuilt classes.zip
---
 gnu/packages/java.scm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

Comments

Ricardo Wurmus Nov. 28, 2019, 4:13 p.m. UTC | #1 
Hi Andrius,

> * gnu/packages/java.scm (jamvm-1-bootstrap): Remove prebuilt classes.zip
> * gnu/packages/java.scm (jamvm): Remove prebuilt classes.zip

Thank you for noticing this problem.  I applied your patch on the
“staging” branch with commit cff1e09504.
diff mbox series

Patch

diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 65f8d6aa77..0ccefb19a1 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -192,7 +192,11 @@  language.")
               (patches (search-patches "jamvm-arm.patch"))
               (sha256
                (base32
-                "06lhi03l3b0h48pc7x58bk9my2nrcf1flpmglvys3wyad6yraf36"))))
+                "06lhi03l3b0h48pc7x58bk9my2nrcf1flpmglvys3wyad6yraf36"))
+              (snippet '(begin
+                          ;; Remove precompiled software.
+                          (delete-file "lib/classes.zip")
+                          #t))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags
@@ -205,6 +209,7 @@  language.")
      `(("classpath" ,classpath-bootstrap)
        ("jikes" ,jikes)
        ("libffi" ,libffi)
+       ("zip" ,zip)
        ("zlib" ,zlib)))
     ;; When built with a recent GCC and glibc the configure step of icedtea-6
     ;; fails with an invalid instruction error.
@@ -659,7 +664,11 @@  machine.")))
                                   version ".tar.gz"))
               (sha256
                (base32
-                "1nl0zxz8y5x8gwsrm7n32bry4dx8x70p8z3s9jbdvs8avyb8whkn"))))
+                "1nl0zxz8y5x8gwsrm7n32bry4dx8x70p8z3s9jbdvs8avyb8whkn"))
+              (snippet '(begin
+                          ;; Remove precompiled software.
+                          (delete-file "src/classlib/gnuclasspath/lib/classes.zip")
+                          #t))))
     (build-system gnu-build-system)
     (arguments
      `(#:configure-flags
@@ -668,6 +677,7 @@  machine.")))
     (inputs
      `(("classpath" ,classpath-devel)
        ("ecj-javac-wrapper" ,ecj-javac-wrapper)
+       ("zip" ,zip)
        ("zlib" ,zlib)))))
 
 (define ecj-javac-wrapper-final