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.
This commit is contained in:
Ricardo Wurmus
parent
bfe26beb3e
commit
74574fd1e3
|
|
@ -129,7 +129,9 @@ EXAMPLES = \
|
|||
|
||||
GOBJECTS = $(MODULES:%.scm=%.go) guix/config.go guix/tests.go
|
||||
|
||||
nobase_dist_guilemodule_DATA = $(MODULES) $(KCONFIGS) $(EXAMPLES)
|
||||
nobase_dist_guilemodule_DATA = \
|
||||
$(MODULES) $(KCONFIGS) $(EXAMPLES) \
|
||||
$(MISC_DISTRO_FILES)
|
||||
nobase_nodist_guilemodule_DATA = $(GOBJECTS) guix/config.scm
|
||||
|
||||
# Do we need to provide our own non-broken (srfi srfi-37) module?
|
||||
|
|
|
|||
|
|
@ -518,6 +518,8 @@ dist_patch_DATA = \
|
|||
gnu/packages/patches/xfce4-panel-plugins.patch \
|
||||
gnu/packages/patches/xmodmap-asprintf.patch
|
||||
|
||||
MISC_DISTRO_FILES = gnu/packages/javac.in
|
||||
|
||||
bootstrapdir = $(guilemoduledir)/gnu/packages/bootstrap
|
||||
bootstrap_x86_64_linuxdir = $(bootstrapdir)/x86_64-linux
|
||||
bootstrap_i686_linuxdir = $(bootstrapdir)/i686-linux
|
||||
|
|
|
|||
|
|
@ -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. <http://debbugs.gnu.org/18101>
|
||||
#: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. <http://debbugs.gnu.org/18101>
|
||||
(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")))
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,61 @@
|
|||
#!/usr/bin/perl -w
|
||||
|
||||
# Taken from Gentoo:
|
||||
# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-java/gcj-jdk/files/javac.in
|
||||
|
||||
use strict;
|
||||
use constant NO_DUP_ARGS => qw(-source -target -d -encoding);
|
||||
use constant STRIP_ARGS => qw(-Werror -implicit:none -J-Xbootclasspath/p:);
|
||||
|
||||
my $ECJ_WARNINGS="-nowarn";
|
||||
|
||||
my ( @bcoption, @source15, @target15, @cp );
|
||||
push @bcoption, '-bootclasspath', '@RT_JAR@:@TOOLS_JAR@'
|
||||
unless grep {$_ eq '-bootclasspath'} @ARGV;
|
||||
push @source15, '-source', '1.5'
|
||||
unless grep {$_ eq '-source'} @ARGV;
|
||||
push @target15, '-target', '1.5'
|
||||
unless grep {$_ eq '-target'} @ARGV;
|
||||
push @cp, '-cp', '.'
|
||||
unless grep {$_ =~ '\-c(p|lasspath)'} @ARGV or $ENV{CLASSPATH};
|
||||
my @ecj_parms = ($ECJ_WARNINGS, @bcoption, @source15, @target15, @cp);
|
||||
|
||||
# Work around ecj's inability to handle duplicate command-line
|
||||
# options and unknown javac options.
|
||||
sub gen_ecj_opts
|
||||
{
|
||||
my @new_args = @{$_[0]};
|
||||
|
||||
for my $opt (NO_DUP_ARGS)
|
||||
{
|
||||
my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
|
||||
if (@indices > 1) {
|
||||
shift @indices; # keep last instance only
|
||||
splice @new_args, $_, 2 for @indices;
|
||||
}
|
||||
}
|
||||
|
||||
for my $opt (STRIP_ARGS)
|
||||
{
|
||||
my @indices = reverse grep {$new_args[$_] eq $opt} 0..$#new_args;
|
||||
splice @new_args, $_, 1 for @indices;
|
||||
}
|
||||
|
||||
return \@new_args;
|
||||
}
|
||||
|
||||
sub split_vm_args
|
||||
{
|
||||
my @new_args = @{$_[0]};
|
||||
|
||||
my @vm_args = map { substr $_, 2 } grep $_ =~ /^-J/, @new_args;
|
||||
my @javac_args = grep $_ !~ /^-J/, @new_args;
|
||||
|
||||
return (\@vm_args, \@javac_args);
|
||||
}
|
||||
|
||||
my ($vm_args, $javac_args) = split_vm_args (gen_ecj_opts( \@ARGV ));
|
||||
my @CLASSPATH = ('@ECJ_JAR@');
|
||||
push @CLASSPATH, split /:/, $ENV{"CLASSPATH"} if exists $ENV{"CLASSPATH"};
|
||||
$ENV{"CLASSPATH"} = join ':', @CLASSPATH;
|
||||
exec '@JAVA@', @$vm_args, 'org.eclipse.jdt.internal.compiler.batch.Main', @ecj_parms, @$javac_args;
|
||||
Loading…
Reference in New Issue