From 74574fd1e3fad5e0c1d061ce194e47dde0f7f175 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Tue, 23 Dec 2014 12:31:50 +0100 Subject: gnu: Add GCJ * gnu/packages/gcc.scm (gcj-4.8, ecj-bootstrap-4.8): New variables. * gnu/packages/javac.in: New file. * gnu-system.am (MISC_DISTRO_FILES): Add it. * Makefile.am (nobase_dist_guilemodule_DATA): Add MISC_DISTRO_FILES. --- gnu/packages/gcc.scm | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) (limited to 'gnu/packages/gcc.scm') diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm index 276b986331..6143f5b335 100644 --- a/gnu/packages/gcc.scm +++ b/gnu/packages/gcc.scm @@ -26,9 +26,11 @@ #:use-module (gnu packages multiprecision) #:use-module (gnu packages texinfo) #:use-module (gnu packages elf) + #:use-module ((gnu packages perl) #:select (perl)) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix build-system gnu) + #:use-module (guix build-system trivial) #:use-module (guix utils) #:use-module (ice-9 regex)) @@ -336,6 +338,77 @@ Go. It also includes runtime support libraries for these languages.") ;; a cyclic dependency. #:separate-lib-output? #f)) +(define-public gcj-4.8 + (package (inherit gcc-4.8) + (name "gcj") + (inputs + `(("fastjar" ,fastjar) + ("perl" ,perl) + ("javac.in" ,(search-path %load-path + "gnu/packages/javac.in")) + ("ecj-bootstrap" ,ecj-bootstrap-4.8) + ,@(package-inputs gcc-4.8))) + ;; Suppress the separate "lib" output, because otherwise the + ;; "lib" and "out" outputs would refer to each other, creating + ;; a cyclic dependency. + (outputs + (delete "lib" (package-outputs gcc-4.8))) + (arguments + (substitute-keyword-arguments `(#:modules ((guix build gnu-build-system) + (guix build utils) + (ice-9 regex) + (srfi srfi-1) + (srfi srfi-26)) + ,@(package-arguments gcc-4.8)) + ((#:configure-flags flags) + `(let ((ecj (assoc-ref %build-inputs "ecj-bootstrap"))) + `("--enable-java-home" + "--enable-gjdoc" + ,(string-append "--with-ecj-jar=" ecj) + "--enable-languages=java" + ,@(remove (cut string-match "--enable-languages.*" <>) + ,flags)))) + ((#:phases phases) + `(alist-cons-after + 'install 'install-javac-and-javap-wrappers + (lambda _ + (let* ((javac (assoc-ref %build-inputs "javac.in")) + (ecj (assoc-ref %build-inputs "ecj-bootstrap")) + (gcj (assoc-ref %outputs "out")) + (gcjbin (string-append gcj "/bin/")) + (jvm (string-append gcj "/lib/jvm/")) + (target (string-append jvm "/bin/javac"))) + + (symlink (string-append gcjbin "jcf-dump") + (string-append jvm "/bin/javap")) + + (copy-file ecj (string-append gcj "/share/java/ecj.jar")) + + ;; Create javac wrapper from the template javac.in by + ;; replacing the @VARIABLES@ with paths. + (copy-file javac target) + (patch-shebang target) + (substitute* target + (("@JAVA@") + (string-append jvm "/bin/java")) + (("@ECJ_JAR@") + (string-append gcj "/share/java/ecj.jar")) + (("@RT_JAR@") + (string-append jvm "/jre/lib/rt.jar")) + (("@TOOLS_JAR@") + (string-append jvm "/lib/tools.jar"))) + (chmod target #o755) + #t)) + ,phases)))))) + +(define ecj-bootstrap-4.8 + (origin + (method url-fetch) + (uri "ftp://sourceware.org/pub/java/ecj-4.8.jar") + (sha256 + (base32 + "10fpqfbdzff1zcbxzh66xc8xbij9saykcj4xzm19wk9p3n7i5zcq")))) + (define-public gcc-objc-4.8 (custom-gcc gcc-4.8 "gcc-objc" '("objc"))) -- cgit 1.4.1