diff options
| author | Florian Franzmann | 2014-06-14 22:42:54 +0200 |
|---|---|---|
| committer | Remko van der Vossen | 2019-05-17 23:32:57 +0200 |
| commit | 699250f4b0819a98b60a7793956170fe5602b02e (patch) | |
| tree | f6be526c3948e569f36869c57aef1010db310516 | |
| parent | e8488894d5f96c3eb00560a39ecfaff36522c44c (diff) | |
gnu/gcc: use ecj.jar if building java compiler
| -rwxr-xr-x | gnu/gcc/BUILD | 10 | ||||
| -rwxr-xr-x | gnu/gcc/DETAILS | 6 | ||||
| -rw-r--r-- | gnu/gcc/HISTORY | 1 | ||||
| -rwxr-xr-x | gnu/gcc/PRE_BUILD | 22 |
4 files changed, 19 insertions, 20 deletions
diff --git a/gnu/gcc/BUILD b/gnu/gcc/BUILD index 7657ba20e2..e71494292d 100755 --- a/gnu/gcc/BUILD +++ b/gnu/gcc/BUILD @@ -1,3 +1,11 @@ +if list_find "$GCC_COMPILER" "java"; then + OPTS+=" --enable-libgcj" && + OPTS+=" --disable-plugin" +else + OPTS+=" --disable-libgcj" && + OPTS+=" --enable-plugin" +fi && + persistent_read gmp GMP_BUILD_ARCH GMP_BUILD_ARCH && persistent_read mpfr MPFR_BUILD_ARCH MPFR_BUILD_ARCH && @@ -13,7 +21,7 @@ fi && # install gcc libraries to /lib instead of /lib64 sedit "s/lib64/lib/" gcc/config/i386/linux64.h && # tell gcc to target binaries to expect the linker in /lib instead of /lib64 -sedit "s/lib64/lib/" gcc/config/i386/t-linux64 +sedit "s/lib64/lib/" gcc/config/i386/t-linux64 && if [[ "$ARCHITECTURE" == "pentium4" || "$ARCHITECTURE" == "pentium-m" ]]; then diff --git a/gnu/gcc/DETAILS b/gnu/gcc/DETAILS index eeed7b3b5e..4ef0261cf9 100755 --- a/gnu/gcc/DETAILS +++ b/gnu/gcc/DETAILS @@ -11,6 +11,12 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY SOURCE2_IGNORE=signature +if list_find "$GCC_COMPILER" "java"; then + SOURCE5=ecj-$(echo $VERSION|cut -f1,2 -d.).jar + SOURCE5_URL[0]=ftp://sourceware.org/pub/java/${SOURCE5} + SOURCE5_HASH=sha512:28f8c6fdbcb19e950b1d0bafb3bcc7a8cba87bc673aa6027cece116599cdee80f0cf5e95a1440544890239f5c754e8a93ab46d9daedd937faef445d7ea33b226 +fi + if list_find "$GCC_COMPILER" "ada" ; then # howto generate the ada bootstraper diff --git a/gnu/gcc/HISTORY b/gnu/gcc/HISTORY index fa35f6345f..841e92502c 100644 --- a/gnu/gcc/HISTORY +++ b/gnu/gcc/HISTORY @@ -11,6 +11,7 @@ gcc-4.9.0-upstream_fixes-1.patch, gcc-4.9-tree-ssa-threadedge.patch: add bugfixes from upstream * DETAILS: use gcc 4.9 based ada bootstrapper for x86_64 + * BUILD, DETAILS, PRE_BUILD: download and use ecj.jar 2014-04-29 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> * DETAILS: version 4.9.0 diff --git a/gnu/gcc/PRE_BUILD b/gnu/gcc/PRE_BUILD index 06b2340163..f0b8c31107 100755 --- a/gnu/gcc/PRE_BUILD +++ b/gnu/gcc/PRE_BUILD @@ -22,25 +22,9 @@ if list_find "$GCC_COMPILER" "ada" ; then # fi && -if list_find "$GCC_COMPILER" "java" ; then - cd $BUILD_DIRECTORY && - unpack_file 9 && - verify_file 15 && - - cp -v $SOURCE_CACHE/$SOURCE15 $SOURCE_DIRECTORY/ecj.jar && - - # Freetype moved headers - Yay! - cd "$SOURCE_DIRECTORY" && - patch -Np1 < "$SCRIPT_DIRECTORY/classpath-ft2include.patch" -fi && -if list_find "$GCC_COMPILER" "fortran" ; then - cd $BUILD_DIRECTORY && - unpack_file 11 -fi && -if list_find "$GCC_COMPILER" "go" ; then - cd $BUILD_DIRECTORY && - unpack_file 16 -fi && +if list_find "$GCC_COMPILER" "java"; then + cp ${SOURCE_CACHE}/${SOURCE5} ${SOURCE_DIRECTORY}/ecj.jar +fi && mk_source_dir $SOURCE_DIRECTORY.bld && cd $SOURCE_DIRECTORY && |