From: Roel Janssen <roel@gnu.org>
To: Ricardo Wurmus <rekado@elephly.net>
Cc: 26966@debbugs.gnu.org
Subject: bug#26966: [PATCH 21/22] gnu: ant: Update to 1.10.1.
Date: Thu, 18 May 2017 11:31:07 +0200 [thread overview]
Message-ID: <rbua86a3417.fsf@gnu.org> (raw)
In-Reply-To: <20170517171905.7840-21-rekado@elephly.net>
Ricardo Wurmus writes:
> * gnu/packages/java.scm (ant): Update to 1.10.1.
> [arguments]: Adjust to build with latest JDK.
> [native-inputs]: Remove gcj; add icedtea-8.
> ---
> gnu/packages/java.scm | 16 +++++++---------
> 1 file changed, 7 insertions(+), 9 deletions(-)
>
> diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
> index f90c3f483..4a5ee62a2 100644
> --- a/gnu/packages/java.scm
> +++ b/gnu/packages/java.scm
> @@ -702,16 +702,14 @@ the standard javac executable. The tool runs on JamVM instead of SableVM.")))
> (define-public ant
> (package (inherit ant-bootstrap)
> (name "ant")
> - ;; The 1.9.x series is the last that can be built with GCJ. The 1.10.x
> - ;; series requires Java 8.
> - (version "1.9.9")
> + (version "1.10.1")
> (source (origin
> (method url-fetch)
> (uri (string-append "mirror://apache/ant/source/apache-ant-"
> version "-src.tar.gz"))
> (sha256
> (base32
> - "1k28mka0m3isy9yr8gz84kz1f3f879rwaxrd44vdn9xbfwvwk86n"))
> + "10p3dh77lkzzzcy32dk9azljixzadp46fggjfbvgkl8mmb8cxxv8"))
> (modules '((guix build utils)))
> (snippet
> '(begin
> @@ -731,9 +729,9 @@ the standard javac executable. The tool runs on JamVM instead of SableVM.")))
> "(.*\\.(bat|cmd)|runant.*|antRun.*)"))
> #t))
> (replace 'build
> - (lambda _
> - (setenv "JAVA_HOME" (string-append (assoc-ref %build-inputs "gcj")
> - "/lib/jvm"))
> + (lambda* (#:key inputs outputs #:allow-other-keys)
> + (setenv "JAVA_HOME" (assoc-ref inputs "jdk"))
> +
> ;; 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
> @@ -742,9 +740,9 @@ the standard javac executable. The tool runs on JamVM instead of SableVM.")))
> (("depends=\"jars,test-jar\"") "depends=\"jars\""))
> (zero? (system* "bash" "bootstrap.sh"
> (string-append "-Ddist.dir="
> - (assoc-ref %outputs "out"))))))))))
> + (assoc-ref outputs "out"))))))))))
> (native-inputs
> - `(("gcj" ,gcj)))))
> + `(("jdk" ,icedtea-8 "jdk")))))
>
> ;; The bootstrap JDK consisting of jamvm, classpath-devel,
> ;; ecj-javac-on-jamvm-wrapper-final cannot build Icedtea 2.x directly, because
Interesting. This new bootstrap mechanism better work ;)
LGTM!
Kind regards,
Roel Janssen
next prev parent reply other threads:[~2017-05-18 9:32 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-17 17:06 bug#26966: New Java bootstrap Ricardo Wurmus
2017-05-17 17:18 ` bug#26966: [PATCH 01/22] gnu: Add jikes Ricardo Wurmus
2017-05-17 17:18 ` bug#26966: [PATCH 02/22] gnu: Add sablevm-classpath Ricardo Wurmus
2017-05-18 10:35 ` Roel Janssen
2017-05-17 17:18 ` bug#26966: [PATCH 03/22] gnu: Add sablevm Ricardo Wurmus
2017-05-18 10:34 ` Roel Janssen
2017-05-17 17:18 ` bug#26966: [PATCH 04/22] gnu: Add ant-bootstrap Ricardo Wurmus
2017-05-18 10:38 ` Roel Janssen
2017-05-17 17:18 ` bug#26966: [PATCH 05/22] gnu: Add ecj-bootstrap Ricardo Wurmus
2017-05-22 7:36 ` Roel Janssen
2017-05-17 17:18 ` bug#26966: [PATCH 06/22] gnu: Add ecj-javac-wrapper Ricardo Wurmus
2017-05-22 7:38 ` Roel Janssen
2017-05-22 8:55 ` Ludovic Courtès
2017-05-22 16:28 ` Ricardo Wurmus
2017-05-17 17:18 ` bug#26966: [PATCH 07/22] gnu: Add classpath Ricardo Wurmus
2017-05-22 7:58 ` Roel Janssen
2017-05-22 17:00 ` Ricardo Wurmus
2017-05-17 17:18 ` bug#26966: [PATCH 08/22] gnu: Add jamvm-bootstrap Ricardo Wurmus
2017-05-22 7:59 ` Roel Janssen
2017-05-17 17:18 ` bug#26966: [PATCH 09/22] gnu: Add classpath-jamvm-wrappers Ricardo Wurmus
2017-05-22 8:05 ` Roel Janssen
2017-05-17 17:18 ` bug#26966: [PATCH 10/22] gnu: Add ecj-javac-on-jamvm-wrapper Ricardo Wurmus
2017-05-22 9:38 ` Roel Janssen
2017-05-22 17:01 ` Ricardo Wurmus
2017-05-17 17:18 ` bug#26966: [PATCH 11/22] gnu: Add classpath-devel Ricardo Wurmus
2017-05-22 9:38 ` Roel Janssen
2017-05-17 17:18 ` bug#26966: [PATCH 12/22] gnu: Add jamvm Ricardo Wurmus
2017-05-22 9:39 ` Roel Janssen
2017-05-17 17:18 ` bug#26966: [PATCH 13/22] gnu: Add ecj-javac-on-jamvm-wrapper-final Ricardo Wurmus
2017-05-22 9:39 ` Roel Janssen
2017-05-17 17:18 ` bug#26966: [PATCH 14/22] gnu: Add icedtea-6 Ricardo Wurmus
2017-05-22 9:43 ` Roel Janssen
2017-05-22 14:33 ` Ricardo Wurmus
2017-05-17 17:18 ` bug#26966: [PATCH 15/22] gnu: icedtea-7: Use icedtea-6 for bootstrapping Ricardo Wurmus
2017-05-18 10:09 ` Ricardo Wurmus
2017-05-17 17:18 ` bug#26966: [PATCH 16/22] gnu: java-swt: Move below the bootstrap packages Ricardo Wurmus
2017-05-22 10:00 ` Roel Janssen
2017-05-17 17:19 ` bug#26966: [PATCH 17/22] gnu: clojure: Move below " Ricardo Wurmus
2017-05-22 10:01 ` Roel Janssen
2017-05-17 17:19 ` bug#26966: [PATCH 18/22] gnu: ant-bootstrap: Do not delete scripts Ricardo Wurmus
2017-05-18 10:54 ` Roel Janssen
2017-05-18 19:57 ` Ricardo Wurmus
2017-05-17 17:19 ` bug#26966: [PATCH 19/22] gnu: ant: Inherit from ant-bootstrap Ricardo Wurmus
2017-05-22 10:02 ` Roel Janssen
2017-05-17 17:19 ` bug#26966: [PATCH 20/22] gnu: ant: Delete bundled jars Ricardo Wurmus
2017-05-18 10:31 ` Roel Janssen
2017-05-17 17:19 ` bug#26966: [PATCH 21/22] gnu: ant: Update to 1.10.1 Ricardo Wurmus
2017-05-18 9:31 ` Roel Janssen [this message]
2017-05-18 20:00 ` Ricardo Wurmus
2017-05-18 21:23 ` Ricardo Wurmus
2017-05-17 17:19 ` bug#26966: [PATCH 22/22] gnu: Remove GCJ Ricardo Wurmus
2017-05-18 9:29 ` Roel Janssen
2017-05-18 10:03 ` Ricardo Wurmus
2017-05-18 10:28 ` Roel Janssen
2017-05-18 11:49 ` Ludovic Courtès
2017-05-18 9:25 ` bug#26966: [PATCH 01/22] gnu: Add jikes Roel Janssen
2017-05-18 11:54 ` Ludovic Courtès
2017-05-18 9:24 ` bug#26966: New Java bootstrap Roel Janssen
2017-05-18 11:47 ` Ludovic Courtès
2017-05-22 10:22 ` Roel Janssen
2017-05-22 17:03 ` Ricardo Wurmus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=rbua86a3417.fsf@gnu.org \
--to=roel@gnu.org \
--cc=26966@debbugs.gnu.org \
--cc=rekado@elephly.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).