diff options
| author | Andrius Štikonas <andrius@stikonas.eu> | 2019-11-28 16:27:39 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2019-11-28 17:12:14 +0100 |
| commit | cff1e095048a238d0b1265c98543d2727d2f6193 (patch) | |
| tree | d3cfa8a9411434b6aa9b7d4f5cd41458ad411ec4 | |
| parent | 34f849a945d25daa76d93839dcf8768c8b45b636 (diff) | |
| download | guix-cff1e095048a238d0b1265c98543d2727d2f6193.tar guix-cff1e095048a238d0b1265c98543d2727d2f6193.tar.gz | |
gnu: java: Remove precompiled classes.
* gnu/packages/java.scm (jamvm-1-bootstrap, jamvm): Remove prebuilt classes.zip.
Signed-off-by: Ricardo Wurmus <rekado@elephly.net>
| -rw-r--r-- | gnu/packages/java.scm | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 955625b0c5..cc63ccf19a 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -193,7 +193,12 @@ 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 @@ -206,6 +211,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. @@ -660,7 +666,12 @@ 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 @@ -669,6 +680,7 @@ machine."))) (inputs `(("classpath" ,classpath-devel) ("ecj-javac-wrapper" ,ecj-javac-wrapper) + ("zip" ,zip) ("zlib" ,zlib))))) (define ecj-javac-wrapper-final |