From: Andrius Štikonas via Guix-patches via <guix-patches@gnu.org>
To: 38321@debbugs.gnu.org
Cc: "Andrius Štikonas" <andrius@stikonas.eu>
Subject: [bug#38321] [PATCH] gnu: java: Remove precompiled blobs.
Date: Fri, 22 Nov 2019 13:07:47 +0200 [thread overview]
Message-ID: <20191122110747.3484981-1-andrius@stikonas.eu> (raw)
In-Reply-To: <20191122102606.3426745-1-andrius@stikonas.eu>
* 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
next prev parent reply other threads:[~2019-11-22 11:08 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2019-11-28 16:13 ` bug#38321: [PATCH] gnu: java: Remove precompiled blobs Ricardo Wurmus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191122110747.3484981-1-andrius@stikonas.eu \
--to=guix-patches@gnu.org \
--cc=38321@debbugs.gnu.org \
--cc=andrius@stikonas.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.