From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49633) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eedsA-00029x-DD for guix-patches@gnu.org; Thu, 25 Jan 2018 04:31:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eeds6-0003hG-6d for guix-patches@gnu.org; Thu, 25 Jan 2018 04:31:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:33841) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eeds6-0003hA-2N for guix-patches@gnu.org; Thu, 25 Jan 2018 04:31:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eeds5-0000JL-T5 for guix-patches@gnu.org; Thu, 25 Jan 2018 04:31:01 -0500 Subject: [bug#29897] [PATCH core-updates] gnu: java-aqute-libg: Fix compilation on java8. Resent-Message-ID: From: Chris Marusich References: <20171229191700.981-1-boskovits@gmail.com> <87zi5cga5w.fsf@gmail.com> Date: Thu, 25 Jan 2018 01:30:22 -0800 In-Reply-To: ("=?UTF-8?Q?G=C3=A1bor?= Boskovits"'s message of "Wed, 17 Jan 2018 13:15:56 +0100") Message-ID: <87r2qel1zl.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: =?UTF-8?Q?G=C3=A1bor?= Boskovits Cc: 29897@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable G=C3=A1bor Boskovits writes: > Thanks for the corrections. > Looks good to me, > I won't send an updated patch then. > Please commit with the modifications. I made the modifications and also tried to enable the tests (see attached patch), but I discovered that some of the tests are failing (and some are passing). Perhaps we should try fixing the tests while we're here? If you do /pre-inst-env guix build --keep-failed java-aqute-libg you can see the failures. The build directory will be kept. If we go to it, we can find a report of the test failures under the path: bnd-3.4.0.REL/aQute.libg/test/test-reports Unfortunately, the ant-build-system doesn't compile the classes with debug info by default. To enable line numbers etc. in the stack traces, we'll need to add debug=3D"true" to the relevant tags, as described here: https://ant.apache.org/manual/Tasks/javac.html If you could help debug the failures, that would be nice. I will also look as I get time. =2D-=20 Chris --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-java-aqute-libg-Explicitly-build-for-Java-7.patch Content-Transfer-Encoding: quoted-printable From=20ff975ea3c3e26a57bd97e13f20e7b8aa380b91e6 Mon Sep 17 00:00:00 2001 From: =3D?UTF-8?q?G=3DC3=3DA1bor=3D20Boskovits?=3D Date: Fri, 29 Dec 2017 20:17:00 +0100 Subject: [PATCH] gnu: java-aqute-libg: Explicitly build for Java 7. * gnu/packages/java.scm (java-aqute-libg)[arguments]: Add keyword make-flags to use source and target 1.7. Co-authored-by: Chris Marusich =2D-- gnu/packages/java.scm | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 2724f0f20..ae7e98977 100644 =2D-- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -6003,7 +6003,28 @@ it manages project dependencies, gives diffs jars, a= nd much more.") (arguments `(#:jar-name "java-aqute-libg.jar" #:source-dir "aQute.libg/src" =2D #:tests? #f)); FIXME: tests are in "aQute.libg/test", not in a ja= va directory + ;; The build fails when source/target are more recent than 1.7. Th= is + ;; is a known issue. See: https://github.com/bndtools/bnd/issues/1= 327 + ;; + ;; It is closed as won't fix. There is no way to change the source = so + ;; that is works on 1.8, and it still works on 1.6, the upstream + ;; target. It works fine on 1.7, however, so we use 1.7. + #:make-flags (list "-Dant.build.javac.source=3D1.7" + "-Dant.build.javac.target=3D1.7") + #:phases + (modify-phases %standard-phases + (add-before 'check 'create-java-test-dir + ;; Move the test directory into test/java, since that's where + ;; ant-build-system's default project in build.xml expects to f= ind + ;; the test classes. + (lambda _ + (rename-file "aQute.libg/test" "aQute.libg/test.tmp") + (mkdir "aQute.libg/test") + (rename-file "aQute.libg/test.tmp" "aQute.libg/test/java")))) + #:test-dir "aQute.libg/test")) + (native-inputs + `(("hamcrest" ,java-hamcrest-core) + ("java-junit" ,java-junit))) (inputs `(("slf4j" ,java-slf4j-api) ("osgi-annot" ,java-osgi-annotation) =2D-=20 2.15.1 --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEy/WXVcvn5+/vGD+x3UCaFdgiRp0FAlppo64ACgkQ3UCaFdgi Rp05/A//cJM7xKZrfMYT2W8ZH/BsRsNqaKB5DrVs28f+yoM7pNxbqAqwO7WBvI8I SCdcWH4Q6A6rCaOByojEc6Mwk0tSmT8nuBARJXURKAG0Fn07iGa0/x2zk+T5T2ti W9SL5u2Lr3XWEJc7GAU5FJQ7TxzAsG7ac3Yzd5vAGIANhnwXBmvMZFG43e2Bhyw+ 0mVLOCs7u3JFrquOz/xPmtvN2Cwdn5Fljh0EqBKEmu9abfYESDFWL0Ssfssgpc0V y1baUboeUUNDFc6GFrhf95TBI/M8vGFgY8mWgJElfnWKmsWidGfPuKbylH+PRJyw 35BCceg5ntBOVgO0ewqL7Uw/Cvax+c9LXgGhw5MyZj+Yva9xJltaSQt2/NCXPF+Y gWLTL0FdIrQ3d35UnDPId5jgq3NA19ljUbPITSfmQ1feNn+dOAGzksg3rjZl8a7q ZHTCx1w65d+M3cFw0+dZ46BMUhx88j8x8QGP3sBItFmhAar+UAo3HevZinmtDFgu NHXRLtvB/SQBAuIRVGW1nIdyqCrHRuhvhm37gFeq6v3/uJruGQZpNnrwukCSbbXX SAn+yB9D0RY6ZNpzVpCgVEDK4lI1nnzP6nFConQeVg5Ww0aYpGczjXPMQAfSrBAj OQcnGTM2IEIZPBKeLyFH75lc8E/fI21gFaE8eqgDCMXqyiaNTVE= =qhqM -----END PGP SIGNATURE----- --==-=-=--