From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52427) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fM0Wd-00087K-58 for guix-patches@gnu.org; Thu, 24 May 2018 20:24:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fM0WY-0003mA-5m for guix-patches@gnu.org; Thu, 24 May 2018 20:24:07 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:39187) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fM0WY-0003ly-06 for guix-patches@gnu.org; Thu, 24 May 2018 20:24:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fM0WX-0001jP-Qz for guix-patches@gnu.org; Thu, 24 May 2018 20:24:01 -0400 Subject: [bug#31570] [PATCH 3/3] 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: Fri, 25 May 2018 08:23:20 +0800 Message-ID: <87po1ka8hz.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=0003-gnu-javacc-Bootstrap-from-javacc-4-instead-of-bootst.patch Content-Transfer-Encoding: quoted-printable From=205e84c4dc3a36fa304277801f4e259aa795cf92e3 Mon Sep 17 00:00:00 2001 From: Alex Vong Date: Thu, 24 May 2018 00:32:51 +0800 Subject: [PATCH 3/3] gnu: javacc: Bootstrap from javacc-4 instead of bootst= rap binary. * gnu/packages/java.scm (javacc)[source](snippet): Delete bootstrap binary. [arguments]: Set 'bootstrap-jar' path. [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 ce4a6b8ac..5bcd94022 100644 =2D-- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -1923,12 +1923,20 @@ debugging, etc.") "111xc9mnmc5a6qz6x3xbhqc07y1lg2b996ggzw0hrblg42zya9xf")) (modules '((guix build utils))) ;; delete bundled jars =2D (snippet '(begin (delete-file-recursively "lib") #t)))) =2D (arguments =2D `(#:test-target "test" + (snippet '(begin (for-each delete-file-recursively + '("bootstrap" "lib")) + #t)))) + (arguments + `(#: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 (replace 'install (install-jars "target"))))))) + (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----- iHUEARYIAB0WIQTdXC2pN4kXBjiMDs8cGaIXrbrArQUCWwdXeAAKCRAcGaIXrbrA rW/SAP49zVQ6dW1EgzkCvEZWLyx6ddztmvoanzCGNrsily9JvgEA3Z6AjAks7lrZ DaH/jovM/0TRvF/4mE1MdlRS+pLG2gE= =4Jqg -----END PGP SIGNATURE----- --==-=-=--