ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-24 21:38:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: java: Remove precompiled classes.

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

Signed-off-by: Ricardo Wurmus <rekado@elephly.net>
This commit is contained in:
Andrius Štikonas 2019-11-28 16:27:39 +01:00 committed by Ricardo Wurmus
parent 34f849a945
commit cff1e09504
No known key found for this signature in database
GPG key ID: 197A5888235FACAC
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gnu/packages/java.scm
View file

@ -193,7 +193,12 @@ (define jamvm-1-bootstrap
(patches (search-patches "jamvm-arm.patch")) (patches (search-patches "jamvm-arm.patch"))
(sha256 (sha256
(base32 (base32
"06lhi03l3b0h48pc7x58bk9my2nrcf1flpmglvys3wyad6yraf36")))) "06lhi03l3b0h48pc7x58bk9my2nrcf1flpmglvys3wyad6yraf36"))
(snippet
'(begin
;; Remove precompiled software.
(delete-file "lib/classes.zip")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -206,6 +211,7 @@ (define jamvm-1-bootstrap
`(("classpath" ,classpath-bootstrap) `(("classpath" ,classpath-bootstrap)
("jikes" ,jikes) ("jikes" ,jikes)
("libffi" ,libffi) ("libffi" ,libffi)
("zip" ,zip)
("zlib" ,zlib))) ("zlib" ,zlib)))
;; When built with a recent GCC and glibc the configure step of icedtea-6 ;; When built with a recent GCC and glibc the configure step of icedtea-6
;; fails with an invalid instruction error. ;; fails with an invalid instruction error.
@ -660,7 +666,12 @@ (define jamvm
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1nl0zxz8y5x8gwsrm7n32bry4dx8x70p8z3s9jbdvs8avyb8whkn")))) "1nl0zxz8y5x8gwsrm7n32bry4dx8x70p8z3s9jbdvs8avyb8whkn"))
(snippet
'(begin
;; Remove precompiled software.
(delete-file "src/classlib/gnuclasspath/lib/classes.zip")
#t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:configure-flags `(#:configure-flags
@ -669,6 +680,7 @@ (define jamvm
(inputs (inputs
`(("classpath" ,classpath-devel) `(("classpath" ,classpath-devel)
("ecj-javac-wrapper" ,ecj-javac-wrapper) ("ecj-javac-wrapper" ,ecj-javac-wrapper)
("zip" ,zip)
("zlib" ,zlib))))) ("zlib" ,zlib)))))
(define ecj-javac-wrapper-final (define ecj-javac-wrapper-final