changeset in /hg/icedtea: Add building of native ecj via GCJ.
Andrew John Hughes
gnu_andrew at member.fsf.org
Fri Sep 26 19:24:56 PDT 2008
changeset 7fad5dbdf081 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=7fad5dbdf081
description:
Add building of native ecj via GCJ.
2008-09-27 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
Build native ecj if GCJ is available.
* acinclude.m4:
Cleanup macros.
* configure.ac:
Cleanup macros and check for GCJ.
* javac.in:
Use native-ecj binary when available.
diffstat:
5 files changed, 88 insertions(+), 48 deletions(-)
ChangeLog | 11 +++++++++
Makefile.am | 12 +++++++++-
acinclude.m4 | 67 ++++++++++++++++++++++++----------------------------------
configure.ac | 37 ++++++++++++++++++++++++++------
javac.in | 9 ++++++-
diffs (470 lines):
diff -r d8f5772482ea -r 7fad5dbdf081 ChangeLog
--- a/ChangeLog Fri Sep 26 23:12:33 2008 +0100
+++ b/ChangeLog Sat Sep 27 03:24:44 2008 +0100
@@ -1,3 +1,14 @@ 2008-09-26 Andrew John Hughes <gnu_and
+2008-09-27 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am:
+ Build native ecj if GCJ is available.
+ * acinclude.m4:
+ Cleanup macros.
+ * configure.ac:
+ Cleanup macros and check for GCJ.
+ * javac.in:
+ Use native-ecj binary when available.
+
2008-09-26 Andrew John Hughes <gnu_andrew at member.fsf.org>
* patches/icedtea-override.patch:
diff -r d8f5772482ea -r 7fad5dbdf081 Makefile.am
--- a/Makefile.am Fri Sep 26 23:12:33 2008 +0100
+++ b/Makefile.am Sat Sep 27 03:24:44 2008 +0100
@@ -759,7 +759,15 @@ clean-patch-fsg:
echo "WARNING Not all patches reverted cleanly" ; \
fi
-stamps/overlay.stamp: stamps/patch.stamp
+stamps/native-ecj.stamp: stamps/patch.stamp
+ mkdir -p stamps ; \
+ if test "x${GCJ}" != x; then \
+ ${GCJ} ${CFLAGS} -Wl,-Bsymbolic -o native-ecj \
+ --main=org.eclipse.jdt.internal.compiler.batch.Main ${ECJ_JAR} ; \
+ fi ; \
+ touch stamps/native-ecj.stamp
+
+stamps/overlay.stamp: stamps/native-ecj.stamp
if [ -e $(abs_top_srcdir)/.hg ]; then \
revision="-r`(cd $(srcdir); $(HG) tip|grep changeset|cut -d':' -f2|sed -r 's#\W+##')`" ; \
fi ; \
@@ -1554,6 +1562,8 @@ icedtea-debug: stamps/icedtea-debug.stam
icedtea-ecj: stamps/icedtea-ecj.stamp
+native-ecj: stamps/native-ecj.stamp
+
patch-ecj: stamps/patch-ecj.stamp
patch: stamps/patch.stamp
diff -r d8f5772482ea -r 7fad5dbdf081 acinclude.m4
--- a/acinclude.m4 Fri Sep 26 23:12:33 2008 +0100
+++ b/acinclude.m4 Sat Sep 27 03:24:44 2008 +0100
@@ -180,7 +180,7 @@ AC_DEFUN([FIND_JAVA],
AC_DEFUN([WITH_OPENJDK_SRC_DIR],
[
- AC_MSG_CHECKING(openjdk sources)
+ AC_MSG_CHECKING(for an OpenJDK source directory)
AC_ARG_WITH([openjdk-src-dir],
[AS_HELP_STRING(--with-openjdk-src-dir,specify the location of the openjdk sources)],
[
@@ -203,7 +203,7 @@ AC_DEFUN([FIND_ECJ_JAR],
[AS_HELP_STRING(--with-ecj-jar,specify location of the ECJ jar)],
[
if test -f "${withval}"; then
- AC_MSG_CHECKING(ecj jar)
+ AC_MSG_CHECKING(for an ecj jar)
ECJ_JAR="${withval}"
AC_MSG_RESULT(${withval})
fi
@@ -244,7 +244,7 @@ AC_DEFUN([FIND_LIBGCJ_JAR],
[AS_HELP_STRING(--with-libgcj-jar,specify location of the libgcj 4.3.x jar)],
[
if test -f "${withval}"; then
- AC_MSG_CHECKING(libgcj jar)
+ AC_MSG_CHECKING(for libgcj jar)
LIBGCJ_JAR="${withval}"
AC_MSG_RESULT(${withval})
fi
@@ -281,7 +281,7 @@ AC_DEFUN([FIND_JAVAH],
[AS_HELP_STRING(--with-javah,specify location of the javah)],
[
if test -f "${withval}"; then
- AC_MSG_CHECKING(javah)
+ AC_MSG_CHECKING(for javah)
JAVAH="${withval}"
AC_MSG_RESULT(${withval})
else
@@ -309,7 +309,7 @@ AC_DEFUN([FIND_JAR],
[AS_HELP_STRING(--with-jar,specify location of the jar)],
[
if test -f "${withval}"; then
- AC_MSG_CHECKING(jar)
+ AC_MSG_CHECKING(for jar)
JAR="${withval}"
AC_MSG_RESULT(${withval})
else
@@ -328,7 +328,7 @@ AC_DEFUN([FIND_JAR],
if test -z "${JAR}"; then
AC_MSG_ERROR("jar was not found.")
fi
- AC_MSG_CHECKING([wether jar supports @<file> argument])
+ AC_MSG_CHECKING([whether jar supports @<file> argument])
touch _config.txt
cat >_config.list <<EOF
_config.txt
@@ -351,7 +351,7 @@ AC_DEFUN([FIND_RMIC],
[AS_HELP_STRING(--with-rmic,specify location of the rmic)],
[
if test -f "${withval}"; then
- AC_MSG_CHECKING(rmic)
+ AC_MSG_CHECKING(for rmic)
RMIC="${withval}"
AC_MSG_RESULT(${withval})
else
@@ -375,13 +375,16 @@ AC_DEFUN([FIND_RMIC],
AC_DEFUN([FIND_ENDORSED_JARS],
[
+ AC_MSG_CHECKING(for endorsed jars dir)
AC_ARG_WITH([endorsed-dir],
[AS_HELP_STRING(--with-endorsed-dir,specify directory of endorsed jars (xalan-j2.jar, xalan-j2-serializer.jar, xerces-j2.jar))],
[
- if test -f "${withval}/xalan-j2.jar"; then
+ if test "x${withval}" = "xno"; then
+ ENDORSED_JARS="${withval}"
+ AC_MSG_RESULT(${withval})
+ else if test -f "${withval}/xalan-j2.jar"; then
if test -f "${withval}/xalan-j2-serializer.jar"; then
if test -f "${withval}/xerces-j2.jar"; then
- AC_MSG_CHECKING(endorsed jars dir)
ENDORSED_JARS="${withval}"
AC_MSG_RESULT(${withval})
fi
@@ -392,7 +395,6 @@ AC_DEFUN([FIND_ENDORSED_JARS],
ENDORSED_JARS=
])
if test -z "${ENDORSED_JARS}"; then
- AC_MSG_CHECKING(for endorsed jars dir)
if test -f "/usr/share/java/xalan-j2.jar"; then
if test -f "/usr/share/java/xalan-j2-serializer.jar"; then
if test -f "/usr/share/java/xerces-j2.jar"; then
@@ -413,7 +415,7 @@ AC_DEFUN([FIND_ENDORSED_JARS],
AC_DEFUN([WITH_OPENJDK_SRC_ZIP],
[
- AC_MSG_CHECKING(openjdk source zip)
+ AC_MSG_CHECKING(for an OpenJDK source zip)
AC_ARG_WITH([openjdk-src-zip],
[AS_HELP_STRING(--with-openjdk-src-zip,specify the location of the openjdk source zip)],
[
@@ -431,7 +433,7 @@ AC_DEFUN([WITH_OPENJDK_SRC_ZIP],
AC_DEFUN([WITH_VISUALVM_SRC_ZIP],
[
- AC_MSG_CHECKING(visualvm source zip)
+ AC_MSG_CHECKING(for a VisualVM source zip)
AC_ARG_WITH([visualvm-src-zip],
[AS_HELP_STRING(--with-visualvm-src-zip, specify the location of the visualvm source zip)],
[
@@ -448,7 +450,7 @@ AC_DEFUN([WITH_VISUALVM_SRC_ZIP],
AC_DEFUN([WITH_NETBEANS_PLATFORM_SRC_ZIP],
[
- AC_MSG_CHECKING(netbeans platform source zip)
+ AC_MSG_CHECKING(for a NetBeans platform source zip)
AC_ARG_WITH([netbeans-platform-src-zip],
[AS_HELP_STRING(--with-netbeans-platform-src-zip, specify the location of the netbeans platform source zip)],
[
@@ -465,7 +467,7 @@ AC_DEFUN([WITH_NETBEANS_PLATFORM_SRC_ZIP
AC_DEFUN([WITH_NETBEANS_PROFILER_SRC_ZIP],
[
- AC_MSG_CHECKING(netbeans profiler source zip)
+ AC_MSG_CHECKING(for a NetBeans profiler source zip)
AC_ARG_WITH([netbeans-profiler-src-zip],
[AS_HELP_STRING(--with-netbeans-src-zip, specify the location of the netbeans profiler source zip)],
[
@@ -482,7 +484,7 @@ AC_DEFUN([WITH_NETBEANS_PROFILER_SRC_ZIP
AC_DEFUN([WITH_ALT_JAR_BINARY],
[
- AC_MSG_CHECKING(alternate jar command)
+ AC_MSG_CHECKING(for an alternate jar command)
AC_ARG_WITH([alt-jar],
[AS_HELP_STRING(--with-alt-jar, specify the location of an alternate jar binary to use for building)],
[
@@ -499,29 +501,24 @@ AC_DEFUN([WITH_ALT_JAR_BINARY],
AC_DEFUN([FIND_XALAN2_JAR],
[
+ AC_MSG_CHECKING(xalan2 jar)
AC_ARG_WITH([xalan2-jar],
[AS_HELP_STRING(--with-xalan2-jar,specify location of the xalan2 jar)],
[
- if test -f "${withval}"; then
- AC_MSG_CHECKING(xalan2 jar)
+ if test -f "${withval}" ; then
XALAN2_JAR="${withval}"
- AC_MSG_RESULT(${withval})
fi
],
[
XALAN2_JAR=
])
if test -z "${XALAN2_JAR}"; then
- AC_MSG_CHECKING(for xalan2 jar)
if test -e "/usr/share/java/xalan-j2.jar"; then
XALAN2_JAR=/usr/share/java/xalan-j2.jar
- AC_MSG_RESULT(${XALAN2_JAR})
elif test -e "/usr/share/java/xalan2.jar"; then
XALAN2_JAR=/usr/share/java/xalan2.jar
- AC_MSG_RESULT(${XALAN2_JAR})
elif test -e "/usr/share/xalan/lib/xalan.jar"; then
XALAN2_JAR=/usr/share/xalan/lib/xalan.jar
- AC_MSG_RESULT(${XALAN2_JAR})
else
AC_MSG_RESULT(no)
fi
@@ -529,34 +526,30 @@ AC_DEFUN([FIND_XALAN2_JAR],
if test -z "${XALAN2_JAR}"; then
AC_MSG_ERROR("A xalan2 jar was not found.")
fi
+ AC_MSG_RESULT(${XALAN2_JAR})
AC_SUBST(XALAN2_JAR)
])
AC_DEFUN([FIND_XALAN2_SERIALIZER_JAR],
[
+ AC_MSG_CHECKING(for xalan2 serializer jar)
AC_ARG_WITH([xalan2-serializer-jar],
[AS_HELP_STRING(--with-xalan2-serializer-jar,specify location of the xalan2-serializer jar)],
[
- if test -f "${withval}"; then
- AC_MSG_CHECKING(xalan2 serializer jar)
+ if test -f "${withval}" ; then
XALAN2_SERIALIZER_JAR="${withval}"
- AC_MSG_RESULT(${withval})
fi
],
[
XALAN2_SERIALIZER_JAR=
])
if test -z "${XALAN2_SERIALIZER_JAR}"; then
- AC_MSG_CHECKING(for xalan2-serializer jar)
if test -e "/usr/share/java/xalan-j2-serializer.jar"; then
XALAN2_SERIALIZER_JAR=/usr/share/java/xalan-j2-serializer.jar
- AC_MSG_RESULT(${XALAN2_SERIALIZER_JAR})
elif test -e "/usr/share/xalan-serializer/lib/serializer.jar"; then
XALAN2_SERIALIZER_JAR=/usr/share/xalan-serializer/lib/serializer.jar
- AC_MSG_RESULT(${XALAN2_SERIALIZER_JAR})
elif test -e "/usr/share/java/serializer.jar"; then
XALAN2_SERIALIZER_JAR=/usr/share/java/serializer.jar
- AC_MSG_RESULT(${XALAN2_SERIALIZER_JAR})
else
AC_MSG_RESULT(no)
fi
@@ -564,37 +557,32 @@ AC_DEFUN([FIND_XALAN2_SERIALIZER_JAR],
if test -z "${XALAN2_SERIALIZER_JAR}"; then
AC_MSG_ERROR("A xalan2-serializer jar was not found.")
fi
+ AC_MSG_RESULT(${XALAN2_SERIALIZER_JAR})
AC_SUBST(XALAN2_SERIALIZER_JAR)
])
AC_DEFUN([FIND_XERCES2_JAR],
[
+ AC_MSG_CHECKING(for xerces2 jar)
AC_ARG_WITH([xerces2-jar],
[AS_HELP_STRING(--with-xerces2-jar,specify location of the xerces2 jar)],
[
- if test -f "${withval}"; then
- AC_MSG_CHECKING(xerces2 jar)
+ if test -f "${withval}" ; then
XERCES2_JAR="${withval}"
- AC_MSG_RESULT(${withval})
fi
],
[
XERCES2_JAR=
])
if test -z "${XERCES2_JAR}"; then
- AC_MSG_CHECKING(for xerces2 jar)
if test -e "/usr/share/java/xerces-j2.jar"; then
XERCES2_JAR=/usr/share/java/xerces-j2.jar
- AC_MSG_RESULT(${XERCES2_JAR})
elif test -e "/usr/share/java/xerces2.jar"; then
XERCES2_JAR=/usr/share/java/xerces2.jar
- AC_MSG_RESULT(${XERCES2_JAR})
elif test -e "/usr/share/xerces-2/lib/xercesImpl.jar"; then
XERCES2_JAR=/usr/share/xerces-2/lib/xercesImpl.jar
- AC_MSG_RESULT(${XERCES2_JAR})
elif test -e "/usr/share/java/xercesImpl.jar"; then
XERCES2_JAR=/usr/share/java/xercesImpl.jar
- AC_MSG_RESULT(${XERCES2_JAR})
else
AC_MSG_RESULT(no)
fi
@@ -602,6 +590,7 @@ AC_DEFUN([FIND_XERCES2_JAR],
if test -z "${XERCES2_JAR}"; then
AC_MSG_ERROR("A xerces2 jar was not found.")
fi
+ AC_MSG_RESULT(${XERCES2_JAR})
AC_SUBST(XERCES2_JAR)
])
@@ -822,7 +811,7 @@ AC_DEFUN([AC_CHECK_WITH_CACAO],
AC_DEFUN([AC_CHECK_WITH_CACAO_HOME],
[
- AC_MSG_CHECKING(CACAO home directory)
+ AC_MSG_CHECKING(for CACAO home directory)
AC_ARG_WITH([cacao-home],
[AS_HELP_STRING([--with-cacao-home],
[CACAO home directory [[default=/usr/local/cacao]]])],
@@ -847,7 +836,7 @@ AC_DEFUN([AC_CHECK_WITH_CACAO_HOME],
AC_DEFUN([AC_CHECK_WITH_CACAO_SRC_ZIP],
[
- AC_MSG_CHECKING(CACAO source zip)
+ AC_MSG_CHECKING(for a CACAO source zip)
AC_ARG_WITH([cacao-src-zip],
[AS_HELP_STRING(--with-cacao-src-zip,specify the location of the CACAO source zip)],
[
diff -r d8f5772482ea -r 7fad5dbdf081 configure.ac
--- a/configure.ac Fri Sep 26 23:12:33 2008 +0100
+++ b/configure.ac Sat Sep 27 03:24:44 2008 +0100
@@ -31,6 +31,7 @@ dnl check for it explicitly rather than
dnl check for it explicitly rather than using AC_PROG_AWK.
FIND_TOOL([GAWK], [gawk])
+AC_MSG_CHECKING(for JDK home directory)
AC_ARG_WITH([gcj-home],
[AS_HELP_STRING([--with-gcj-home],
[gcj home directory \
@@ -46,8 +47,10 @@ AC_ARG_WITH([gcj-home],
[
SYSTEM_GCJ_DIR=/usr/lib/jvm/java-gcj
])
+AC_MSG_RESULT(${SYSTEM_GCJ_DIR})
AC_SUBST(SYSTEM_GCJ_DIR)
+AC_MSG_CHECKING(for existing OpenJDK installation)
AC_ARG_WITH([openjdk-home],
[AS_HELP_STRING([--with-openjdk-home],
[OpenJDK home directory \
@@ -63,8 +66,10 @@ AC_ARG_WITH([openjdk-home],
[
SYSTEM_OPENJDK_DIR=/usr/lib/jvm/java-openjdk
])
+AC_MSG_RESULT(${SYSTEM_OPENJDK_DIR})
AC_SUBST(SYSTEM_OPENJDK_DIR)
+AC_MSG_CHECKING(for existing IcedTea installation)
AC_ARG_WITH([icedtea-home],
[AS_HELP_STRING([--with-icedtea-home],
[IcedTea home directory \
@@ -80,8 +85,10 @@ AC_ARG_WITH([icedtea-home],
[
SYSTEM_ICEDTEA_DIR=/usr/lib/jvm/java-icedtea
])
+AC_MSG_RESULT(${SYSTEM_ICEDTEA_DIR})
AC_SUBST(SYSTEM_ICEDTEA_DIR)
+AC_MSG_CHECKING(for Ant home directory)
AC_ARG_WITH([ant-home],
[AS_HELP_STRING([--with-ant-home],
[Ant home directory (default is /usr/share/ant)])],
@@ -96,33 +103,43 @@ AC_ARG_WITH([ant-home],
[
SYSTEM_ANT_DIR=/usr/share/ant
])
+AC_MSG_RESULT(${SYSTEM_ANT_DIR})
AC_SUBST(SYSTEM_ANT_DIR)
+AC_MSG_CHECKING(whether to build gcjwebplugin)
AC_ARG_ENABLE([gcjwebplugin],
[AS_HELP_STRING([--disable-gcjwebplugin],
[Disable compilation of browser plugin])],
[enable_plugin="${enableval}"], [enable_plugin="yes"])
AM_CONDITIONAL(ENABLE_PLUGIN, test "x${enable_plugin}" = "xyes")
-
+AC_MSG_RESULT(${enable_plugin})
+
+AC_MSG_CHECKING(whether to build the LiveConnect plugin)
AC_ARG_ENABLE([liveconnect],
[AS_HELP_STRING([--enable-liveconnect],
[Enable experimental LiveConnect plugin])],
[enable_liveconnect="yes"], [enable_liveconnect="no"])
AM_CONDITIONAL(ENABLE_LIVECONNECT, test "x${enable_liveconnect}" = "xyes")
-
+AC_MSG_RESULT(${enable_liveconnect})
+
+AC_MSG_CHECKING(whether to build documentation)
AC_ARG_ENABLE([docs],
[AS_HELP_STRING([--disable-docs],
[Disable generation of documentation])],
[ENABLE_DOCS="${enableval}"], [ENABLE_DOCS='yes'])
AM_CONDITIONAL([ENABLE_DOCS], [test x$ENABLE_DOCS = xyes])
-
+AC_MSG_RESULT(${ENABLE_DOCS})
+
+AC_MSG_CHECKING(whether to build VisualVM)
AC_ARG_ENABLE([visualvm],
[AS_HELP_STRING([--enable-visualvm],
[Enable compilation of visualvm. Requires that \
--with-netbeans-dir=DIR is specified.])],
[enable_visualvm="yes"], [enable_visualvm="no"])
AM_CONDITIONAL(WITH_VISUALVM, test "x${enable_visualvm}" = "xyes")
-
+AC_MSG_RESULT(${enable_visualvm})
+
+AC_MSG_CHECKING(whether to build using an existing installation of IcedTea)
AC_ARG_WITH([icedtea],
[AS_HELP_STRING([--with-icedtea],
[build IcedTea with system-installed IcedTea])],
@@ -138,7 +155,9 @@ AC_ARG_WITH([icedtea],
with_icedtea=false
])
AM_CONDITIONAL(WITH_ICEDTEA, test "${with_icedtea}" = true)
-
+AC_MSG_RESULT(${with_icedtea})
+
+AC_MSG_CHECKING(whether to build using an existing installation of OpenJDK)
AC_ARG_WITH([openjdk],
[AS_HELP_STRING([--with-openjdk],
[build IcedTea with system-installed OpenJDK])],
@@ -154,7 +173,9 @@ AC_ARG_WITH([openjdk],
with_openjdk=false
])
AM_CONDITIONAL(WITH_OPENJDK, test "${with_openjdk}" = true)
-
+AC_MSG_RESULT(${with_openjdk})
+
+AC_MSG_CHECKING(how many parallel build jobs to execute)
AC_ARG_WITH([parallel-jobs],
[AS_HELP_STRING([--with-parallel-jobs],
[build IcedTea using the specified number of parallel jobs])],
@@ -169,6 +190,7 @@ AC_ARG_WITH([parallel-jobs],
[
PARALLEL_JOBS=2
])
+AC_MSG_RESULT(${PARALLEL_JOBS})
AC_SUBST(PARALLEL_JOBS)
SET_ARCH_DIRS
@@ -237,6 +259,9 @@ fi
fi
AC_SUBST([HG])
+AC_PATH_TOOL([GCJ],[gcj])
+AC_SUBST([GCJ])
+
dnl pkgconfig cannot be used to find these headers and libraries.
AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],[]
,[AC_MSG_ERROR("CUPS headers were not found -
diff -r d8f5772482ea -r 7fad5dbdf081 javac.in
--- a/javac.in Fri Sep 26 23:12:33 2008 +0100
+++ b/javac.in Sat Sep 27 03:24:44 2008 +0100
@@ -30,5 +30,10 @@ then
NEW_ARGS=`echo $NEW_ARGS | sed -e 's/-Werror//1'`
fi
-CLASSPATH=@ECJ_JAR@${CLASSPATH:+:}$CLASSPATH \
- @JAVA@ org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS
+if [ -e @abs_top_builddir@/native-ecj ] ; then
+ @abs_top_builddir@/native-ecj -1.5 -nowarn $bcoption $NEW_ARGS ;
+else
+ CLASSPATH=@ECJ_JAR@${CLASSPATH:+:}$CLASSPATH \
+ @JAVA@ org.eclipse.jdt.internal.compiler.batch.Main -1.5 -nowarn $bcoption $NEW_ARGS
+fi
+
More information about the distro-pkg-dev
mailing list