From b7ab0f263338f54d3982b6d1cc91306f4691116a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Boskovits?= Date: Sun, 7 Jan 2018 22:23:56 +0100 Subject: [PATCH] gnu: java-asm: Update to 6.0. * gnu/packages/java.scm (java-asm): Update to 6.0. [propagated-inputs]: Add java-aqute-bndlib (new dependency). [arguments]: Adjust make-flags, so that the build does not complain about unset properties. --- gnu/packages/java.scm | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index c04b45c53..38bfffaf5 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -2660,23 +2660,31 @@ archives (jar).") (define-public java-asm (package (name "java-asm") - (version "5.2") + (version "6.0") (source (origin (method url-fetch) (uri (string-append "http://download.forge.ow2.org/asm/" "asm-" version ".tar.gz")) (sha256 (base32 - "0kxvmv5275rnjl7jv0442k3wjnq03ngkb7sghs78avf45pzm4qgr")))) + "115l5pqblirdkmzi32dxx7gbcm4jy0s14y5wircr6h8jdr9aix00")))) (build-system ant-build-system) + (propagated-inputs + `(("java-aqute-bndlib" ,java-aqute-bndlib))) (arguments `(#:build-target "compile" ;; The tests require an old version of Janino, which no longer compiles ;; with the JDK7. #:tests? #f - ;; We don't need these extra ant tasks, but the build system asks us to - ;; provide a path anyway. - #:make-flags (list (string-append "-Dobjectweb.ant.tasks.path=foo")) + #:make-flags + (list + ;; We don't need these extra ant tasks, but the build system asks us to + ;; provide a path anyway. + "-Dobjectweb.ant.tasks.path=dummy-path" + ;; The java-aqute.bndlib JAR file will be put onto the classpath and + ;; used during the build automatically by ant-build-system, but + ;; java-asm's build.xml fails unless we provide something here. + "-Dbiz.aQute.bnd.path=dummy-path") #:phases (modify-phases %standard-phases (add-before 'install 'build-jars -- 2.15.1