From 60eb5614d1478eae57986898272ce4ca033ceade Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Mon, 12 Oct 2015 14:21:15 +0200
Subject: [PATCH] gnu: ant: Build with GCJ.
* gnu/packages/java.scm (ant)[native-inputs]: Replace "icedtea6" with
"gcj".
---
gnu/packages/java.scm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 9e632f3fbf5..e4d0afb3986 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -159,8 +159,8 @@ (define-public ant
(alist-replace
'build
(lambda _
- (setenv "JAVA_HOME"
- (assoc-ref %build-inputs "icedtea6"))
+ (setenv "JAVA_HOME" (string-append (assoc-ref %build-inputs "gcj")
+ "/lib/jvm"))
;; Disable tests to avoid dependency on hamcrest-core, which needs
;; Ant to build. This is necessary in addition to disabling the
;; "check" phase, because the dependency on "test-jar" would always
@@ -174,7 +174,7 @@ (define-public ant
'configure
(alist-delete 'install %standard-phases))))))
(native-inputs
- `(("icedtea6" ,icedtea6 "jdk")))
+ `(("gcj" ,gcj)))
(home-page "http://ant.apache.org")
(synopsis "Build tool for Java")
(description
--
GitLab