From 42756d081274ff38e833cb093c7be3fc252a2013 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 24 Mar 2015 12:09:29 +0100 Subject: [PATCH] WIP: icedtea7 --- gnu/packages/java.scm | 156 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 155 insertions(+), 1 deletion(-) diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 00ee5a1..a2e7a0e 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -20,6 +20,7 @@ #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) #:use-module (guix download) + #:use-module (guix utils) #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages attr) @@ -45,7 +46,8 @@ #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (gnu packages zip) - #:use-module (gnu packages texinfo)) + #:use-module (gnu packages texinfo) + #:use-module ((srfi srfi-1) #:select (fold alist-delete))) (define-public ant (package @@ -562,3 +564,155 @@ build process and its dependencies, whereas Make uses Makefile format.") ;; IcedTea is released under the GPL2 + Classpath exception, which is the ;; same license as both GNU Classpath and OpenJDK. (license license:gpl2+))) + +(define-public icedtea7 + (let* ((version "2.5.5") + (drop (lambda (name hash) + (origin + (method url-fetch) + (uri (string-append + "http://icedtea.classpath.org/download/drops/" + "/icedtea7/" version "/" name ".tar.bz2")) + (sha256 (base32 hash)))))) + (package (inherit icedtea6) + (name "icedtea7") + (version version) + (source (origin + (method url-fetch) + (uri (string-append + "http://icedtea.wildebeest.org/download/source/icedtea-" + version ".tar.xz")) + (sha256 + (base32 + "1irxk2ndwsfk4c1zbzb5h3rpwv2bc9bhfjvz6p4dws5476vsxrq9")) + (modules '((guix build utils))) + (snippet + '(substitute* "Makefile.in" + ;; do not leak information about the build host + (("DISTRIBUTION_ID=\"\\$\\(DIST_ID\\)\"") + "DISTRIBUTION_ID=\"\\\"guix\\\"\""))))) + (arguments + `(#:parallel-build? #f + ,@(substitute-keyword-arguments `(#:modules ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-1) + (srfi srfi-26)) + ,@(package-arguments icedtea6)) + ((#:configure-flags flags) + `(let ((jdk (assoc-ref %build-inputs "icedtea6")) + (ant (assoc-ref %build-inputs "ant"))) + `("--disable-bootstrap" + ;;"--disable-bootstrap-tools" + "--without-rhino" + "--enable-nss" + "--enable-infinality" + "--enable-system-gio" + "--enable-system-gtk" + "--enable-system-gif" + "--enable-system-png" + "--enable-system-jpeg" + "--enable-system-zlib" + "--enable-system-lcms" + "--enable-system-fontconfig" + "--disable-downloading" + "--disable-xrender" ;; TODO: more X11 extensions are needed + ;see /usr/include/X11/extensions + ;;"--with-openjdk-src-dir=./openjdk" + ,(string-append "--with-ant-home=" ant) + ,(string-append "--with-jdk-home=" jdk) + ))) + ((#:phases phases) + `(alist-replace + 'unpack + (lambda* (#:key source inputs #:allow-other-keys) + (let ((target (string-append "icedtea-" ,version))) + (and (zero? (system* "tar" "xvf" source)) + (chdir target) + (mkdir "openjdk") + (mkdir "openjdk/corba") + (mkdir "openjdk/jdk") + (mkdir "openjdk/hotspot") + (zero? (system* "tar" "xvjf" (assoc-ref inputs "openjdk-drop") + "-C" "openjdk" "--strip-components=1")) + (zero? (system* "tar" "xvjf" (assoc-ref inputs "corba-drop") + "-C" "openjdk/corba" "--strip-components=1")) + (zero? (system* "tar" "xvjf" (assoc-ref inputs "jdk-drop") + "-C" "openjdk/jdk" "--strip-components=1")) + (zero? (system* "tar" "xvjf" (assoc-ref inputs "hotspot-drop") + "-C" "openjdk/hotspot" "--strip-components=1"))) + (format #t "copying stuff\n") + ;; TODO: we already unpack them. Can I disable the tarball check? + (copy-file (assoc-ref inputs "openjdk-drop") "openjdk.tar.bz2") + (copy-file (assoc-ref inputs "corba-drop") "corba.tar.bz2") + (copy-file (assoc-ref inputs "hotspot-drop") "hotspot.tar.bz2") + + (copy-file (assoc-ref inputs "jaxp-drop") "jaxp.tar.bz2") + (copy-file (assoc-ref inputs "jaxws-drop") "jaxws.tar.bz2") + (copy-file (assoc-ref inputs "jdk-drop") "jdk.tar.bz2") + (copy-file (assoc-ref inputs "langtools-drop") "langtools.tar.bz2"))) + (alist-replace + 'set-additional-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "openjdk/jdk/make/common/shared/Sanity.gmk" + (("ALSA_INCLUDE=/usr/include/alsa/version.h") + (string-append "ALSA_INCLUDE=" + (assoc-ref inputs "alsa-lib") + "/include/alsa/version.h"))) + (setenv "CC" "gcc") + (setenv "JAVA_HOME" + (assoc-ref %build-inputs "icedtea6")) + (setenv "ALT_PREVIOUS_RELEASE_IMAGE" + (assoc-ref inputs "icedtea6")) + (setenv "CPATH" + (string-append (assoc-ref inputs "libxrender") + "/include/X11/extensions" ":" + (assoc-ref inputs "libxtst") + "/include/X11/extensions" ":" + (assoc-ref inputs "libxinerama") + "/include/X11/extensions" ":" + (or (getenv "CPATH") ""))) + (setenv "ALT_CUPS_HEADERS_PATH" + (string-append (assoc-ref inputs "cups") + "/include")) + (setenv "ALT_FREETYPE_HEADERS_PATH" + (string-append (assoc-ref inputs "freetype") + "/include")) + (setenv "ALT_FREETYPE_LIB_PATH" + (string-append (assoc-ref inputs "freetype") + "/lib"))) + (alist-delete 'patch-patches ,phases))))))) + (native-inputs + `(("ant" ,ant) + ("icedtea6" ,icedtea6 "jdk") + ("openjdk7-src" + ,(origin + (method url-fetch) + (uri (string-append + "http://download.java.net/openjdk/jdk7/" + "promoted/b147/openjdk-7-fcs-src-b147-27_jun_2011.zip")) + (sha256 + (base32 + "1qhwlz9y5qmwmja4qnxg6sn3pgsg1i11fb9j41w8l26acyhk34rs")))) + ("openjdk-drop" + ,(drop "openjdk" + "03gxqn17cxwl1nspnwigacaqd28p02d45f396j5f4kkbzfnbl0ak")) + ("corba-drop" + ,(drop "corba" + "0ldcckknn2f92jv1144cnn0z3wmvxln28wc00rc6xxblnjcnamzh")) + ("jaxp-drop" + ,(drop "jaxp" + "0mnjdziffcnyqlyvf8dw1hrl4kiiwmh8ia0ym417wgvnjpaihci9")) + ("jaxws-drop" + ,(drop "jaxws" + "1gkmypnhygx2mxhca3ngy620k993wi2cc1wysc0np06y1rkx1mkn")) + ("jdk-drop" + ,(drop "jdk" + "10x43mqjfn43jlckic0nyf7apyyjyr910cdmmvy41kvw8ljhvg61")) + ("langtools-drop" + ,(drop "langtools" + "0q5nqc14r6vmhxgikw3wgdcc0r9symp830v13isnv8qdjgm6kcki")) + ("hotspot-drop" + ,(drop "hotspot" + "1yqxfd2jwbm5y41wscyfx8h0fr3h8ny2g2mda5iwd8sikxsaj96p")) + ,@(fold alist-delete (package-native-inputs icedtea6) + '("openjdk6-src" "ant-bootstrap" "gcj"))))))) -- 2.1.0