From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37339) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fLXOn-0001GN-8p for guix-patches@gnu.org; Wed, 23 May 2018 13:18:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fLXOk-0008Pg-47 for guix-patches@gnu.org; Wed, 23 May 2018 13:18:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:37694) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fLXOj-0008PQ-Ub for guix-patches@gnu.org; Wed, 23 May 2018 13:18:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fLXOj-0005YE-Lw for guix-patches@gnu.org; Wed, 23 May 2018 13:18:01 -0400 Subject: [bug#31570] [PATCH 2/2] gnu: javacc: Bootstrap from javacc-4 instead of bootstrap binary. References: <871se2jnya.fsf@gmail.com> In-Reply-To: <871se2jnya.fsf@gmail.com> Resent-Message-ID: From: Alex Vong Date: Thu, 24 May 2018 01:17:46 +0800 Message-ID: <87sh6ii951.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" 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" To: 31570@debbugs.gnu.org Cc: alexvong1995@gmail.com --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0002-gnu-javacc-Bootstrap-from-javacc-4-instead-of-bootst.patch Content-Transfer-Encoding: quoted-printable From=20567852350ba03246253218e56d87e5ab13e4bfaf Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Thu, 24 May 2018 00:32:51 +0800 Subject: [PATCH 2/2] gnu: javacc: Bootstrap from javacc-4 instead of bootst= rap binary. * gnu/packages/java.scm (javacc)[arguments]: Use javacc-4, remove bootstrap binary. [native-inputs]: Add 'javacc-4'. =2D-- gnu/packages/java.scm | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c64313046..9ee795aba 100644 =2D-- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1910,13 +1910,21 @@ debugging, etc.") (base32 "111xc9mnmc5a6qz6x3xbhqc07y1lg2b996ggzw0hrblg42zya9xf")))) (arguments =2D `(#:test-target "test" + `(#:make-flags ; bootstrap from javacc-4 + (list (string-append "-Dbootstrap-jar=3D" + (assoc-ref %build-inputs "javacc") + "/share/java/javacc.jar")) + #:test-target "test" #:phases (modify-phases %standard-phases =2D (add-after 'unpack 'delete-bundled-libs + (add-after 'unpack 'delete-bundled-jars (lambda _ =2D (delete-file-recursively "lib") #t)) =2D (replace 'install (install-jars "target"))))))) + (delete-file-recursively "bootstrap") + (delete-file-recursively "lib") + #t)) + (replace 'install (install-jars "target"))))) + (native-inputs + `(("javacc" ,javacc-4))))) =20 ;; This is the last 3.x release of ECJ (define-public java-ecj-3 =2D-=20 2.17.0 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEARYIAB0WIQTdXC2pN4kXBjiMDs8cGaIXrbrArQUCWwWiOgAKCRAcGaIXrbrA ra2fAP99ipSft1gvRE37voUjtZdJ3Vv+os6k1tAxYyx8mOi+HQD7BroCQkLwGehl dP4MT0b0zXSJ6vbE2ZQXzVjNaQNYzAI= =vzh6 -----END PGP SIGNATURE----- --==-=-=--