public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GCJ 4.5: Build with `--enable-java-home' & co.

Browse Source 
svn path=/nixpkgs/trunk/; revision=21973
This commit is contained in:
Ludovic Courtès 2010-05-25 19:38:13 +00:00
parent f7bd2a829e
commit fc6b345f94
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/compilers/gcc-4.5/default.nix
View File

@ -7,6 +7,7 @@
, staticCompiler ? false , staticCompiler ? false
, enableShared ? true , enableShared ? true
, texinfo ? null , texinfo ? null
, perl ? null # optional, for texi2pod (then pod2man); required for Java
, gmp, mpfr, mpc, gettext, which , gmp, mpfr, mpc, gettext, which
, libelf # optional, for link-time optimizations (LTO) , libelf # optional, for link-time optimizations (LTO)
, ppl ? null, cloogppl ? null # optional, for the Graphite optimization framework , ppl ? null, cloogppl ? null # optional, for the Graphite optimization framework
@ -29,7 +30,8 @@
assert langTreelang -> bison != null && flex != null; assert langTreelang -> bison != null && flex != null;
assert langJava -> zip != null && unzip != null assert langJava -> zip != null && unzip != null
&& zlib != null && boehmgc != null; && zlib != null && boehmgc != null
&& perl != null; # for `--enable-java-home'
assert langAda -> gnatboot != null; assert langAda -> gnatboot != null;
assert langVhdl -> gnat != null; assert langVhdl -> gnat != null;
@ -168,6 +170,7 @@ stdenv.mkDerivation ({
libcCross crossMingw; libcCross crossMingw;
buildInputs = [ texinfo gmp mpfr mpc libelf gettext which ] buildInputs = [ texinfo gmp mpfr mpc libelf gettext which ]
++ (optional (perl != null) perl)
++ (optional (ppl != null) ppl) ++ (optional (ppl != null) ppl)
++ (optional (cloogppl != null) cloogppl) ++ (optional (cloogppl != null) cloogppl)
++ (optionals langTreelang [bison flex]) ++ (optionals langTreelang [bison flex])
@ -185,7 +188,11 @@ stdenv.mkDerivation ({
${if enableShared then "" else "--disable-shared"} ${if enableShared then "" else "--disable-shared"}
${if ppl != null then "--with-ppl=${ppl}" else ""} ${if ppl != null then "--with-ppl=${ppl}" else ""}
${if cloogppl != null then "--with-cloog=${cloogppl}" else ""} ${if cloogppl != null then "--with-cloog=${cloogppl}" else ""}
${if langJava then "--with-ecj-jar=${javaEcj}" else ""} ${if langJava then
"--with-ecj-jar=${javaEcj} " +
"--enable-java-home --with-java-home=\${prefix} " +
"--with-jvm-root-dir=\${prefix}/jdk"
else ""}
${if javaAwtGtk then "--enable-java-awt=gtk" else ""} ${if javaAwtGtk then "--enable-java-awt=gtk" else ""}
${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""} ${if langJava && javaAntlr != null then "--with-antlr-jar=${javaAntlr}" else ""}
--with-gmp=${gmp} --with-gmp=${gmp}

2
pkgs/top-level/all-packages.nix
View File

@ -2218,7 +2218,7 @@ let
langCC = true; langCC = true;
langC = false; langC = false;
profiledCompiler = false; profiledCompiler = false;
inherit zip unzip zlib boehmgc gettext pkgconfig; inherit zip unzip zlib boehmgc gettext pkgconfig perl;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
inherit (gnome) libart_lgpl; inherit (gnome) libart_lgpl;
inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender inherit (xlibs) libX11 libXt libSM libICE libXtst libXi libXrender