From patchwork Fri Nov 22 11:07:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 16188 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id EB32D1772D; Fri, 22 Nov 2019 11:08:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 9572117722 for ; Fri, 22 Nov 2019 11:08:14 +0000 (GMT) Received: from localhost ([::1]:49558 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iY6nO-0001ax-0L for patchwork@mira.cbaines.net; Fri, 22 Nov 2019 06:08:14 -0500 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 X-Loop: help-debbugs@gnu.org 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-From: Andrius =?utf-8?b?xaB0aWtvbmFz?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Nov 2019 11:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38321 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38321@debbugs.gnu.org Cc: Andrius =?utf-8?b?xaB0aWtvbmFz?= Received: via spool by 38321-submit@debbugs.gnu.org id=B38321.157442087718207 (code B ref 38321); Fri, 22 Nov 2019 11:08:02 +0000 Received: (at 38321) by debbugs.gnu.org; 22 Nov 2019 11:07:57 +0000 Received: from localhost ([127.0.0.1]:53830 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iY6n7-0004jb-AJ for submit@debbugs.gnu.org; Fri, 22 Nov 2019 06:07:57 -0500 Received: from mail.stikonas.eu ([82.71.3.19]:37954) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iY6n5-0004jS-3P for 38321@debbugs.gnu.org; Fri, 22 Nov 2019 06:07:55 -0500 Received: from pine.stikonas.eu (localhost [127.0.0.1]) by mail.stikonas.eu (Postfix) with ESMTP id 58CE63A0E48C; Fri, 22 Nov 2019 11:07:53 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=stikonas.eu; s=mail; t=1574420873; bh=FS6LW7Cp/1PekAh0WaQisABIT6vdHuS5MkSbkccXyaw=; h=From:To:Cc:Subject:Date; b=H40tl1QDUw16p1VT6axuuKh1vRY1jVXgPmoMxgZiF16oXsGxQCakreD9MZkOfLRpC +U5B7TDqE9BEqOHEwAT8DkITMafHPu6iOqF1wHEcJsuDvNt6AzSej07lh8kq/CtIYg IHa5V6uQZ0FfUgjYg4jNd8G4dh9301CitciF3EsA= Received: from localhost.localdomain ([5.20.200.50]) by pine.stikonas.eu with ESMTPSA id RrAYEonB113qAQwAtWO0jw (envelope-from ); Fri, 22 Nov 2019 11:07:53 +0000 Date: Fri, 22 Nov 2019 13:07:47 +0200 Message-Id: <20191122110747.3484981-1-andrius@stikonas.eu> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" Reply-to: =?unknown-8bit?q?Andrius_=C5=A0tikonas_=3Candrius=40stikonas=2Eeu?= =?unknown-8bit?q?=3E=2C_Andrius_=C5=A0tikonas_via_Guix-patches_=3Cguix-patc?= =?unknown-8bit?q?hes=40gnu=2Eorg=3E?= From: =?unknown-8bit?q?Andrius_=C5=A0tikonas_via_Guix-patches_via_=3Cguix-pa?= =?unknown-8bit?q?tches=40gnu=2Eorg=3E?= X-getmail-retrieved-from-mailbox: Patches * 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