* [bug#38321] [PATCH] gnu: jamvm-1-bootstrap: Remove precompiled blob.
@ 2019-11-22 10:26 Andrius Štikonas via Guix-patches via
2019-11-22 11:07 ` [bug#38321] [PATCH] gnu: java: Remove precompiled blobs Andrius Štikonas via Guix-patches via
0 siblings, 1 reply; 3+ messages in thread
From: Andrius Štikonas via Guix-patches via @ 2019-11-22 10:26 UTC (permalink / raw)
To: 38321, rekado; +Cc: Andrius Štikonas
* gnu/packages/java.scm (jamvm-1-bootstrap): Remove prebuilt lib/classes.zip
---
gnu/packages/java.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 65f8d6aa77..013faa2f48 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.
--
2.24.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [bug#38321] [PATCH] gnu: java: Remove precompiled blobs.
2019-11-22 10:26 [bug#38321] [PATCH] gnu: jamvm-1-bootstrap: Remove precompiled blob Andrius Štikonas via Guix-patches via
@ 2019-11-22 11:07 ` Andrius Štikonas via Guix-patches via
2019-11-28 16:13 ` bug#38321: " Ricardo Wurmus
0 siblings, 1 reply; 3+ messages in thread
From: Andrius Štikonas via Guix-patches via @ 2019-11-22 11:07 UTC (permalink / raw)
To: 38321; +Cc: Andrius Štikonas
* 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(-)
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
--
2.23.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* bug#38321: [PATCH] gnu: java: Remove precompiled blobs.
2019-11-22 11:07 ` [bug#38321] [PATCH] gnu: java: Remove precompiled blobs Andrius Štikonas via Guix-patches via
@ 2019-11-28 16:13 ` Ricardo Wurmus
0 siblings, 0 replies; 3+ messages in thread
From: Ricardo Wurmus @ 2019-11-28 16:13 UTC (permalink / raw)
To: Andrius Štikonas; +Cc: 38321-done
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.
--
Ricardo
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-11-28 16:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-22 10:26 [bug#38321] [PATCH] gnu: jamvm-1-bootstrap: Remove precompiled blob Andrius Štikonas via Guix-patches via
2019-11-22 11:07 ` [bug#38321] [PATCH] gnu: java: Remove precompiled blobs Andrius Štikonas via Guix-patches via
2019-11-28 16:13 ` bug#38321: " Ricardo Wurmus
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).