From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:37591) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iY6nI-0001ZP-96 for guix-patches@gnu.org; Fri, 22 Nov 2019 06:08:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iY6nD-0005Oy-BZ for guix-patches@gnu.org; Fri, 22 Nov 2019 06:08:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:45009) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iY6nC-0005Ol-S7 for guix-patches@gnu.org; Fri, 22 Nov 2019 06:08:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iY6nC-0004jx-J5 for guix-patches@gnu.org; Fri, 22 Nov 2019 06:08:02 -0500 Subject: [bug#38321] [PATCH] gnu: java: Remove precompiled blobs. References: <20191122102606.3426745-1-andrius@stikonas.eu> In-Reply-To: <20191122102606.3426745-1-andrius@stikonas.eu> Resent-Message-ID: Date: Fri, 22 Nov 2019 13:07:47 +0200 Message-Id: <20191122110747.3484981-1-andrius@stikonas.eu> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" Reply-to: Andrius Štikonas , Andrius Štikonas via Guix-patches From: Andrius Štikonas via Guix-patches via To: 38321@debbugs.gnu.org Cc: Andrius =?UTF-8?Q?=C5=A0tikonas?= * 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