changeset in /hg/icedtea6: Remove detection of libgcj.jar and th...
Andrew John Hughes
gnu_andrew at member.fsf.org
Wed Dec 17 12:17:07 PST 2008
changeset cedcd6958a6f in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=cedcd6958a6f
description:
Remove detection of libgcj.jar and the corresponding LIBGCJ_JAR.
We already detect/accept the home directory for GCJ, the JAR file
can be derived from this.
The LIBGCJ_JAR macro was hiding a GCC_OLD macro to enable the 4.3 patches,
which assumes a connection between the JAR file and the version of GCC.
I converted this to a proper check.
2008-12-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
Remove use of LIBGCJ_JAR, replacing with
SYSTEM_GCJ_DIR/jre/lib/rt.jar.
* acinclude.m4:
(AC_CHECK_GCC_VERSION): Added.
(FIND_LIBGCJ_JAR): Removed.
* configure.ac:
Call AC_CHECK_GCC_VERSION, don't
call FIND_LIBGCJ_JAR.
* javac.in:
Use SYSTEM_GCJ_DIR/jre/lib/rt.jar not LIBGCJ_JAR.
diffstat:
5 files changed, 26 insertions(+), 43 deletions(-)
ChangeLog | 16 +++++++++++++++-
Makefile.am | 3 +--
acinclude.m4 | 46 ++++++++--------------------------------------
configure.ac | 2 +-
javac.in | 2 +-
diffs (130 lines):
diff -r 4f248bc51029 -r cedcd6958a6f ChangeLog
--- a/ChangeLog Wed Dec 17 18:03:57 2008 +0000
+++ b/ChangeLog Wed Dec 17 20:16:53 2008 +0000
@@ -1,4 +1,18 @@ 2008-12-09 Andrew John Hughes <gnu_and
-2008-12-09 Andrew John Hughes <gnu_andrew at member.fsf.org>
+2008-12-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
+
+ * Makefile.am:
+ Remove use of LIBGCJ_JAR, replacing with
+ SYSTEM_GCJ_DIR/jre/lib/rt.jar.
+ * acinclude.m4:
+ (AC_CHECK_GCC_VERSION): Added.
+ (FIND_LIBGCJ_JAR): Removed.
+ * configure.ac:
+ Call AC_CHECK_GCC_VERSION, don't
+ call FIND_LIBGCJ_JAR.
+ * javac.in:
+ Use SYSTEM_GCJ_DIR/jre/lib/rt.jar not LIBGCJ_JAR.
+
+2008-12-17 Andrew John Hughes <gnu_andrew at member.fsf.org>
* Makefile.am:
Remove the HotSpot directory while extracting
diff -r 4f248bc51029 -r cedcd6958a6f Makefile.am
--- a/Makefile.am Wed Dec 17 18:03:57 2008 +0000
+++ b/Makefile.am Wed Dec 17 20:16:53 2008 +0000
@@ -224,7 +224,6 @@ ICEDTEA_ENV_ECJ = \
"ALT_BOOTDIR=$(ICEDTEA_BOOT_DIR)" \
"ALT_BINARY_PLUGS_PATH=$(abs_top_builddir)/bootstrap/jdk1.7.0" \
"BUILD_ARCH_DIR=$(BUILD_ARCH_DIR)" \
- "LIBGCJ_JAR=$(LIBGCJ_JAR)" \
"ICEDTEA_RT=$(ICEDTEA_RT)" \
"ICEDTEA_BUILD_DIR=$(ICEDTEA_BUILD_DIR_ECJ)" \
"ICEDTEA_CLS_DIR=$(ICEDTEA_CLS_DIR_ECJ)" \
@@ -233,7 +232,7 @@ ICEDTEA_ENV_ECJ = \
"BOOTCLASSPATH_CLS_RT=-bootclasspath \
$(ICEDTEA_CLS_DIR_ECJ):$(ICEDTEA_RT)" \
"BOOTCLASSPATH_CLS=-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \
- "BOOTCLASSPATH_RT_LIBGCJ=-bootclasspath $(ICEDTEA_RT):$(LIBGCJ_JAR)" \
+ "BOOTCLASSPATH_RT_LIBGCJ=-bootclasspath $(ICEDTEA_RT):$(SYSTEM_GCJ_DIR)/jre/lib/rt.jar" \
"CLASSPATH=" \
"LD_LIBRARY_PATH=" \
"GENSRCDIR=$(abs_top_builddir)/generated" \
diff -r 4f248bc51029 -r cedcd6958a6f acinclude.m4
--- a/acinclude.m4 Wed Dec 17 18:03:57 2008 +0000
+++ b/acinclude.m4 Wed Dec 17 20:16:53 2008 +0000
@@ -242,44 +242,14 @@ AC_DEFUN([FIND_ECJ_JAR],
AC_SUBST(ECJ_JAR)
])
-AC_DEFUN([FIND_LIBGCJ_JAR],
-[
- AM_CONDITIONAL(GCC_OLD, test x != x)
- AC_ARG_WITH([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(for libgcj jar)
- LIBGCJ_JAR="${withval}"
- AC_MSG_RESULT(${withval})
- fi
- ],
- [
- LIBGCJ_JAR=
- ])
- if test -z "${LIBGCJ_JAR}"; then
- AC_MSG_CHECKING(for libgcj-4.3.*.jar, libgcj-4.2.*.jar or libgcj-4.1.*.jar)
- for jar in /usr/share/java/libgcj-4.3*.jar; do
- test -e $jar && LIBGCJ_JAR=$jar
- done
- if test -n "${LIBGCJ_JAR}"; then
- AC_MSG_RESULT(${LIBGCJ_JAR})
- else
- AM_CONDITIONAL(GCC_OLD, test x = x)
- for jar in /usr/share/java/libgcj-4.1*.jar /usr/share/java/libgcj-4.2*.jar; do
- test -e $jar && LIBGCJ_JAR=$jar
- done
- if test -n ${LIBGCJ_JAR}; then
- AC_MSG_RESULT(${LIBGCJ_JAR})
- else
- AC_MSG_RESULT(no)
- fi
- fi
- fi
- if test -z "${LIBGCJ_JAR}"; then
- AC_MSG_ERROR("A LIBGCJ jar was not found.")
- fi
- AC_SUBST(LIBGCJ_JAR)
+AC_DEFUN([AC_CHECK_GCC_VERSION],
+[
+ AC_MSG_CHECKING([version of GCC])
+ gcc_ver=`${CC} -dumpversion`
+ gcc_major_ver=`echo ${gcc_ver}|cut -d'.' -f1`
+ gcc_minor_ver=`echo ${gcc_ver}|cut -d'.' -f2`
+ AM_CONDITIONAL(GCC_OLD, test ! ${gcc_major_ver} -ge 4 -a ${gcc_minor_ver} -ge 3)
+ AC_MSG_RESULT([${gcc_ver} (major version ${gcc_major_ver}, minor version ${gcc_minor_ver})])
])
AC_DEFUN([FIND_JAVAH],
diff -r 4f248bc51029 -r cedcd6958a6f configure.ac
--- a/configure.ac Wed Dec 17 18:03:57 2008 +0000
+++ b/configure.ac Wed Dec 17 20:16:53 2008 +0000
@@ -35,6 +35,7 @@ AC_CHECK_WITH_GCJ
AC_CHECK_WITH_GCJ
AC_CHECK_WITH_HOTSPOT_BUILD
AC_PATH_TOOL([LINUX32],[linux32])
+AC_CHECK_GCC_VERSION
AC_MSG_CHECKING([for a JDK home directory])
AC_ARG_WITH([gcj-home],
@@ -292,7 +293,6 @@ else
FIND_JAR
FIND_RMIC
FIND_ECJ_JAR
- FIND_LIBGCJ_JAR
FIND_XALAN2_JAR
FIND_XALAN2_SERIALIZER_JAR
FIND_XERCES2_JAR
diff -r 4f248bc51029 -r cedcd6958a6f javac.in
--- a/javac.in Wed Dec 17 18:03:57 2008 +0000
+++ b/javac.in Wed Dec 17 20:16:53 2008 +0000
@@ -2,7 +2,7 @@
case "$*" in
*-bootclasspath*) ;;
- *) bcoption="-bootclasspath @LIBGCJ_JAR@"
+ *) bcoption="-bootclasspath @SYSTEM_GCJ_DIR@/jre/lib/rt.jar"
esac
# Work around ecj's inability to handle duplicate command-line
More information about the distro-pkg-dev
mailing list