diff options
author | Arwed von Merkatz | 2008-09-02 16:51:26 +0200 |
---|---|---|
committer | Arwed von Merkatz | 2008-09-02 16:51:26 +0200 |
commit | c00628c34e5c9f43c25851c79cdaa310293ba5af (patch) | |
tree | bdbd3d921a7c45c122a364eefe485f414dbac4ca | |
parent | 6091ea3a48b984e43ed2fc94577033c42687beb2 (diff) |
Revert "gcj: fixed to be _useable_, added ECJ (Eclipse compiler for Java) jar as a source file (GCJ >=4.3 depends on it)"
This reverts commit fb1862913bd40905203119550eb260ad0b737c31.
-rwxr-xr-x | gnu/gcj/DETAILS | 13 | ||||
-rw-r--r-- | gnu/gcj/HISTORY | 6 | ||||
-rwxr-xr-x | gnu/gcj/INSTALL | 2 | ||||
-rwxr-xr-x | gnu/gcj/PRE_BUILD | 4 | ||||
-rw-r--r-- | gnu/gcj/ecj-latest.jar.sig | bin | 287 -> 0 bytes | |||
-rw-r--r-- | gnu/gcj/specs_java | 4 |
6 files changed, 5 insertions, 24 deletions
diff --git a/gnu/gcj/DETAILS b/gnu/gcj/DETAILS index 3b486988aa..d3549fddb3 100755 --- a/gnu/gcj/DETAILS +++ b/gnu/gcj/DETAILS @@ -11,7 +11,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION SOURCE3_URL[0]=$GNU_URL/gcc/gcc-$VERSION/$SOURCE2 SOURCE3_URL[1]=ftp://gcc.gnu.org/pub/gcc/releases/gcc-$VERSION/$SOURCE2 -# upstream signatures +#upstream signatures SOURCE4=$SOURCE.sig SOURCE4_URL[0]=${SOURCE_URL[0]}.sig SOURCE_GPG=gnu.gpg:$SOURCE.sig:UPSTREAM_KEY @@ -24,19 +24,14 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/gcc-$VERSION SOURCE6_URL[0]=${SOURCE3_URL[0]}.sig SOURCE3_GPG=gnu.gpg:$SOURCE3.sig:UPSTREAM_KEY SOURCE6_IGNORE=signature - -# Eclipse compiler for Java (needed since 4.3) - SOURCE7=ecj-latest.jar - SOURCE7_URL[0]=ftp://sourceware.org/pub/java/$SOURCE7 - SOURCE7_GPG=gurus.gpg:$SOURCE7.sig - LICENSE[0]=GPL - WEB_SITE=http://gcc.gnu.org/java/ + WEB_SITE=http://gcc.gnu.org/ ENTERED=20040705 TMPFS=off DOCS="$DOCS INSTALL" KEYWORDS="compiler java" - SHORT="GNU compiler for Java" + SHORT="the GNU java compiler" cat << EOF The GNU java compiler and library. EOF + diff --git a/gnu/gcj/HISTORY b/gnu/gcj/HISTORY index ff8238d119..3be8ef1734 100644 --- a/gnu/gcj/HISTORY +++ b/gnu/gcj/HISTORY @@ -1,9 +1,3 @@ -2008-06-14 Vlad Glagolev <stealth@sourcemage.org> - * DETAILS: added Eclipse compiler for Java (jar file, needed since 4.3) - * PRE_BUILD: move ECJ jar file into source tree, libjava conf will take - * INSTALL: fixed multijob build - * specs_java: renewed specs for Java (from lang-specs.h) - 2008-06-11 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 4.3.1 diff --git a/gnu/gcj/INSTALL b/gnu/gcj/INSTALL index 7f5e3840b6..a592fcd661 100755 --- a/gnu/gcj/INSTALL +++ b/gnu/gcj/INSTALL @@ -3,12 +3,10 @@ # cd $SOURCE_DIRECTORY.bld && -make_single && make -C gcc java.install-common java.install-man && install -c gcc/jc1 ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION/ && install -c gcc/jvgenmain ${INSTALL_ROOT}/usr/libexec/gcc/$HOST/$VERSION/ && make -C $HOST/libjava/ install && -make_normal && # specs file stuff local SPECSDIR=${INSTALL_ROOT}/usr/lib/gcc/$HOST/$VERSION && diff --git a/gnu/gcj/PRE_BUILD b/gnu/gcj/PRE_BUILD index bf17ee73a5..8aee4f38c7 100755 --- a/gnu/gcj/PRE_BUILD +++ b/gnu/gcj/PRE_BUILD @@ -7,8 +7,4 @@ default_pre_build && cd $BUILD_DIRECTORY && unpack_file 2 && unpack_file 3 && -verify_file 7 && - -cp -v $SOURCE_CACHE/$SOURCE7 $SOURCE_DIRECTORY/ecj.jar && - mk_source_dir $SOURCE_DIRECTORY.bld diff --git a/gnu/gcj/ecj-latest.jar.sig b/gnu/gcj/ecj-latest.jar.sig Binary files differdeleted file mode 100644 index b26563d701..0000000000 --- a/gnu/gcj/ecj-latest.jar.sig +++ /dev/null diff --git a/gnu/gcj/specs_java b/gnu/gcj/specs_java index 4f0dd3dd86..1b3f4934bc 100644 --- a/gnu/gcj/specs_java +++ b/gnu/gcj/specs_java @@ -1,7 +1,5 @@ @java: -%{fjni:%{femit-class-files:%e-fjni and -femit-class-files are incompatible}} %{fjni:%{femit-class-file:%e-fjni and -femit-class-file are incompatible}} %{femit-class-file:%{!fsyntax-only:%e-femit-class-file should used along with -fsyntax-only}} %{femit-class-files:%{!fsyntax-only:%e-femit-class-file should used along with -fsyntax-only}} %{E:%{e-E is not valid for gcj}} \ - %{.java|fsaw-java-file:ecj1 %i %{W*} %{w} %{g*} %{fbootclasspath*} %{fenable-assertions*} %{fdisable-assertions*} %{fencoding*} %{ffilelist-file} %{foutput-class-dir*} %{g*} %{fsource*} %{!fsource*:-fsource=1.5} %{ftarget*} %{!femit-class-files|!ftarget*:-ftarget=1.5} %{!findirect-dispatch:-fzip-dependency %U.zip} %{!fsyntax-only:-fzip-target %U.jar}} -%{.class|.zip|.jar|!fsyntax-only:jc1 %{.java|fsaw-java-file:%U.jar -fsource-filename=%i %<ffilelist-file} %{.class|.zip|.jar|ffilelist-file|fcompile-resource*:%i} %(jc1) %(cc1_options) %{I*} %{!findirect-dispatch:-faux-classpath %U.zip} %{MD:-MD_} %{MMD:-MMD_} %{M} %{MM} %{MA} %{MT*} %{MF*} %(invoke_as)} +%{fjni:%{femit-class-files:%e-fjni and -femit-class-files are incompatible}} %{fjni:%{femit-class-file:%e-fjni and -femit-class-file are incompatible}} %{femit-class-file:%{!fsyntax-only:%e-femit-class-file should used along with -fsyntax-only}} %{femit-class-files:%{!fsyntax-only:%e-femit-class-file should used along with -fsyntax-only}} %{!E:jc1 %i %(jc1) %(cc1_options) %{+e*} %{I*} %{MD:-MD_} %{MMD:-MMD_} %{M} %{MM} %{MA} %{MT*} %{MF*} %{!fsyntax-only:%(invoke_as)}} .java: @java |