Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (fb1862913bd40905203119550eb260ad0b737c31)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (fb1862913bd40905203119550eb260ad0b737c31)
  • Date: Sat, 14 Jun 2008 05:21:11 -0500

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

gnu/gcj/DETAILS | 13 +++++++++----
gnu/gcj/HISTORY | 6 ++++++
gnu/gcj/INSTALL | 2 ++
gnu/gcj/PRE_BUILD | 4 ++++
gnu/gcj/ecj-latest.jar.sig |binary
gnu/gcj/specs_java | 4 +++-
6 files changed, 24 insertions(+), 5 deletions(-)

New commits:
commit fb1862913bd40905203119550eb260ad0b737c31
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gcj: fixed to be _useable_, added ECJ (Eclipse compiler for Java) jar as
a source file (GCJ >=4.3 depends on it)
renewed lang specs compatible with new version, updated website,
short desc, multi -> single job build

diff --git a/gnu/gcj/DETAILS b/gnu/gcj/DETAILS
index d3549fd..3b48698 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,14 +24,19 @@ 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/
+ WEB_SITE=http://gcc.gnu.org/java/
ENTERED=20040705
TMPFS=off
DOCS="$DOCS INSTALL"
KEYWORDS="compiler java"
- SHORT="the GNU java compiler"
+ SHORT="GNU compiler for Java"
cat << EOF
The GNU java compiler and library.
EOF
-
diff --git a/gnu/gcj/HISTORY b/gnu/gcj/HISTORY
index 3be8ef1..ff8238d 100644
--- a/gnu/gcj/HISTORY
+++ b/gnu/gcj/HISTORY
@@ -1,3 +1,9 @@
+2008-06-14 Vlad Glagolev <stealth AT 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 AT vabo.cz>
* DETAILS: 4.3.1

diff --git a/gnu/gcj/INSTALL b/gnu/gcj/INSTALL
index a592fcd..7f5e384 100755
--- a/gnu/gcj/INSTALL
+++ b/gnu/gcj/INSTALL
@@ -3,10 +3,12 @@
#
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 8aee4f3..bf17ee7 100755
--- a/gnu/gcj/PRE_BUILD
+++ b/gnu/gcj/PRE_BUILD
@@ -7,4 +7,8 @@ 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
new file mode 100644
index 0000000..b26563d
Binary files /dev/null and b/gnu/gcj/ecj-latest.jar.sig differ
diff --git a/gnu/gcj/specs_java b/gnu/gcj/specs_java
index 1b3f493..4f0dd3d 100644
--- a/gnu/gcj/specs_java
+++ b/gnu/gcj/specs_java
@@ -1,5 +1,7 @@
@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:jc1 %i %(jc1) %(cc1_options)
%{+e*} %{I*} %{MD:-MD_} %{MMD:-MMD_} %{M} %{MM} %{MA} %{MT*} %{MF*}
%{!fsyntax-only:%(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:%{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)}

.java:
@java



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (fb1862913bd40905203119550eb260ad0b737c31), Vlad Glagolev, 06/14/2008

Archive powered by MHonArc 2.6.24.

Top of Page