GCJ 4.4: Move ecj.jar' out of the src' attribute.

svn path=/nixpkgs/trunk/; revision=16417
This commit is contained in:
Ludovic Courtès 2009-07-17 18:06:28 +00:00
parent 1dfef78633
commit 8cbb8848a9
2 changed files with 19 additions and 10 deletions

View file

@ -62,6 +62,12 @@ fi
preConfigure() {
# Copy `ecj.jar' to `$(top_srcdir)' when available.
if [ -f "$javaEcj" ]
then
cp -v "$javaEcj" "ecj.jar"
fi
# Perform the build in a different directory.
mkdir ../build
cd ../build

View file

@ -45,16 +45,6 @@ stdenv.mkDerivation ({
optional langJava (fetchurl {
url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2";
sha256 = "0i60llrllgm4sbplw2rc9b0gi0mxr88la07a72mvlbblzpxn22hb";
}) ++
optional langJava (fetchurl {
# The `$(top_srcdir)/ecj.jar' file is automatically picked up at
# `configure' time.
# XXX: Eventually we might want to take it from upstream.
url = "ftp://sourceware.org/pub/java/ecj-4.3.jar";
name = "ecj.jar";
sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx";
});
patches =
@ -62,6 +52,19 @@ stdenv.mkDerivation ({
++ optional noSysDirs ./no-sys-dirs.patch
++ optional (noSysDirs && langFortran) ./no-sys-dirs-fortran.patch;
javaEcj =
if langJava
then fetchurl {
# The `$(top_srcdir)/ecj.jar' file is automatically picked up at
# `configure' time.
# XXX: Eventually we might want to take it from upstream.
url = "ftp://sourceware.org/pub/java/ecj-4.3.jar";
sha256 = "0jz7hvc0s6iydmhgh5h2m15yza7p2rlss2vkif30vm9y77m97qcx";
}
else "";
inherit noSysDirs profiledCompiler staticCompiler;
buildInputs = [ texinfo gmp mpfr gettext ]