/hg/icedtea6: Remove --with-gcj-jdk and --with-openjdk, replacin...
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Aug 10 04:11:43 PDT 2010
changeset 0ba4ad0c362b in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=0ba4ad0c362b
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Aug 10 12:11:36 2010 +0100
Remove --with-gcj-jdk and --with-openjdk, replacing with --with
--jdk-home and --disable-bootstrap.
2009-07-17 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am: Remove use of WITH_OPENJDK and
SYSTEM_GCJ_DIR replacing with BOOTSTRAPPING and
SYSTEM_JDK_DIR as appropriate.
* acinclude.m4: (FIND_JAVAC): Search for generic 'javac'
first. (IT_FIND_ECJ): Only use ecj as javac if JAVA is
unset. (IT_CHECK_ECJ): Add configure output.
(IT_FIND_JAVAC): Likewise. (IT_CHECK_JAVAC): Likewise.
(FIND_JAVA): Try java in SYSTEM_JDK_DIR before searching.
(FIND_JAVAH): Likewise for javah. (FIND_JAR): Likewise for
jar. (FIND_RMIC): Likewise for rmic.
(IT_CHECK_IF_BOOTSTRAPPING): Allow bootstrapping to be disabled.
Makes explicit the side-effect of --with-openjdk.
(IT_CHECK_FOR_JDK): Find JDK to use. Replaces --with-gcj-jdk,
and --with-openjdk. At present, only checks for gcj jdks if
not bootstrapping. (AC_CHECK_FOR_OPENJDK): Removed.
(AC_CHECK_FOR_GCJ_JDK): Removed.
* configure.ac: Remove --with-openjdk. Always check for a JDK
and then allow individual binaries to be overridden by
--with-x.
diffstat:
4 files changed, 160 insertions(+), 186 deletions(-)
ChangeLog | 27 ++++++
Makefile.am | 55 ++++++-------
acinclude.m4 | 232 ++++++++++++++++++++++++----------------------------------
configure.ac | 32 ++------
diffs (truncated from 590 to 500 lines):
diff -r 0974e80c4a6e -r 0ba4ad0c362b ChangeLog
--- a/ChangeLog Mon Aug 09 17:08:38 2010 -0400
+++ b/ChangeLog Tue Aug 10 12:11:36 2010 +0100
@@ -1,3 +1,30 @@ 2010-08-09 Deepak Bhole <dbhole at redhat.
+2009-07-17 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ Remove use of WITH_OPENJDK and SYSTEM_GCJ_DIR
+ replacing with BOOTSTRAPPING and SYSTEM_JDK_DIR
+ as appropriate.
+ * acinclude.m4:
+ (FIND_JAVAC): Search for generic 'javac' first.
+ (IT_FIND_ECJ): Only use ecj as javac if JAVA is unset.
+ (IT_CHECK_ECJ): Add configure output.
+ (IT_FIND_JAVAC): Likewise.
+ (IT_CHECK_JAVAC): Likewise.
+ (FIND_JAVA): Try java in SYSTEM_JDK_DIR before searching.
+ (FIND_JAVAH): Likewise for javah.
+ (FIND_JAR): Likewise for jar.
+ (FIND_RMIC): Likewise for rmic.
+ (IT_CHECK_IF_BOOTSTRAPPING): Allow bootstrapping to be disabled.
+ Makes explicit the side-effect of --with-openjdk.
+ (IT_CHECK_FOR_JDK): Find JDK to use. Replaces --with-gcj-jdk,
+ and --with-openjdk. At present, only checks for gcj jdks if
+ not bootstrapping.
+ (AC_CHECK_FOR_OPENJDK): Removed.
+ (AC_CHECK_FOR_GCJ_JDK): Removed.
+ * configure.ac:
+ Remove --with-openjdk. Always check for a JDK and then allow
+ individual binaries to be overridden by --with-x.
+
2010-08-09 Deepak Bhole <dbhole at redhat.com>
* Makefile.am:
diff -r 0974e80c4a6e -r 0ba4ad0c362b Makefile.am
--- a/Makefile.am Mon Aug 09 17:08:38 2010 -0400
+++ b/Makefile.am Tue Aug 10 12:11:36 2010 +0100
@@ -138,10 +138,10 @@ endif
# FIXME: This should not depend on bootstrapping
# but on whether MEMORY_LIMIT is accepted
# as an argument to javac
-if WITH_OPENJDK
+if BOOTSTRAPPING
+ MEMORY_LIMIT =
+else
MEMORY_LIMIT = -J-Xmx1024m
-else
- MEMORY_LIMIT =
endif
if WITH_CACAO
@@ -151,17 +151,14 @@ else
ICEDTEA_DEBUG_BUILD_TARGET = debug_build
endif
-# FIXME (bootstrap): Assumption is WITH_OPENJDK == no bootstrap
-if WITH_OPENJDK
+if BOOTSTRAPPING
+ BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
+ ICEDTEA_HOME = $(ICEDTEA_BOOT_DIR)
+ INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-ecj.stamp
+else
BOOTSTRAP_DIRECTORY_STAMP =
- SYSTEM_JDK_DIR = $(SYSTEM_OPENJDK_DIR)
ICEDTEA_HOME = $(SYSTEM_JDK_DIR)
INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink.stamp
-else
- BOOTSTRAP_DIRECTORY_STAMP = stamps/bootstrap-directory.stamp
- SYSTEM_JDK_DIR = $(SYSTEM_GCJ_DIR)
- ICEDTEA_HOME = $(ICEDTEA_BOOT_DIR)
- INITIAL_BOOTSTRAP_LINK_STAMP = stamps/bootstrap-directory-symlink-ecj.stamp
endif
if CP_SUPPORTS_REFLINK
@@ -491,6 +488,8 @@ ICEDTEA_ENV_ECJ = $(ICEDTEA_ENV) \
BOOTCLASSPATH_CLS_RT="-bootclasspath $(ICEDTEA_CLS_DIR_ECJ):$(RUNTIME)" \
BOOTCLASSPATH_CLS="-bootclasspath $(ICEDTEA_CLS_DIR_ECJ)" \
BOOTCLASSPATH_RT_LIBGCJ="-bootclasspath $(RUNTIME)" \
+ CLASSPATH="" \
+ LD_LIBRARY_PATH="" \
GENSRCDIR="$(abs_top_builddir)/generated" \
JAR_KNOWS_ATFILE="$(JAR_KNOWS_ATFILE)" \
JAR_KNOWS_J_OPTIONS="$(JAR_KNOWS_J_OPTIONS)" \
@@ -1464,20 +1463,29 @@ clean-icedtea-ecj:
# Rebuild targets
rebuild:
-if WITH_OPENJDK
+if BOOTSTRAPPING
+ rm -f stamps/icedtea-ecj.stamp
+ rm -f stamps/icedtea-against-ecj.stamp
+ $(ARCH_PREFIX) $(MAKE) icedtea-against-ecj
+ @echo "ecj-poured IcedTea is served (again):" $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image
+else
rm -f stamps/icedtea.stamp
rm -f stamps/icedtea-against-icedtea.stamp
$(ARCH_PREFIX) $(MAKE) icedtea-against-icedtea
@echo "IcedTea is served (again):" $(BUILD_OUTPUT_DIR)/j2sdk-image
-else
- rm -f stamps/icedtea-ecj.stamp
- rm -f stamps/icedtea-against-ecj.stamp
- $(ARCH_PREFIX) $(MAKE) icedtea-against-ecj
- @echo "ecj-poured IcedTea is served (again):" $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image
endif
hotspot:
-if WITH_OPENJDK
+if BOOTSTRAPPING
+ rm -f stamps/icedtea-ecj.stamp
+ rm -f stamps/icedtea-against-ecj.stamp
+ $(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-against-ecj
+ mkdir -p \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
+ cp $(ECJ_BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \
+ $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
+ @echo "Hotspot is served:" $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image
+else
rm -f stamps/icedtea.stamp
rm -f stamps/icedtea-against-icedtea.stamp
$(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-against-icedtea
@@ -1486,15 +1494,6 @@ if WITH_OPENJDK
cp $(BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \
$(BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
@echo "Hotspot is served:" $(BUILD_OUTPUT_DIR)/j2sdk-image
-else
- rm -f stamps/icedtea-ecj.stamp
- rm -f stamps/icedtea-against-ecj.stamp
- $(ARCH_PREFIX) $(MAKE) ICEDTEA_BUILD_TARGET=hotspot icedtea-against-ecj
- mkdir -p \
- $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
- cp $(ECJ_BUILD_OUTPUT_DIR)/$(SERVER_DIR)/libjvm.so \
- $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image/jre/lib/$(INSTALL_ARCH_DIR)/server
- @echo "Hotspot is served:" $(ECJ_BUILD_OUTPUT_DIR)/j2sdk-image
endif
stamps/icedtea-against-ecj.stamp: \
@@ -1840,7 +1839,7 @@ clean-add-cacao-debug:
# configure script arguments, quoted in single quotes
CONFIGURE_ARGS = @CONFIGURE_ARGS@
ADD_ZERO_CONFIGURE_ARGS = \
- --with-openjdk=$(BUILD_OUTPUT_DIR)/j2sdk-image \
+ --with-jdk-home=$(BUILD_OUTPUT_DIR)/j2sdk-image \
--enable-zero
if ADD_SHARK_BUILD
ADD_ZERO_CONFIGURE_ARGS += \
diff -r 0974e80c4a6e -r 0ba4ad0c362b acinclude.m4
--- a/acinclude.m4 Mon Aug 09 17:08:38 2010 -0400
+++ b/acinclude.m4 Tue Aug 10 12:11:36 2010 +0100
@@ -131,42 +131,46 @@ AC_DEFUN([SET_OS_DIRS],
AC_DEFUN([FIND_JAVAC],
[
- user_specified_javac=
+ JAVAC=${SYSTEM_JDK_DIR}/bin/javac
+ IT_FIND_JAVAC
+ IT_FIND_ECJ
- CLASSPATH_WITH_ECJ
- CLASSPATH_WITH_JAVAC
-
- if test "x${ECJ}" = x && test "x${JAVAC}" = x && test "x${user_specified_javac}" != xecj; then
- AC_MSG_ERROR([cannot find javac, try --with-ecj])
+ if test "x${JAVAC}" = x; then
+ AC_MSG_ERROR([cannot find a Java compiler, try --with-javac or --with-ecj])
fi
+ AC_SUBST(JAVAC)
])
-AC_DEFUN([CLASSPATH_WITH_ECJ],
+AC_DEFUN([IT_FIND_ECJ],
[
AC_ARG_WITH([ecj],
[AS_HELP_STRING(--with-ecj,bytecode compilation with ecj)],
[
if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
- CLASSPATH_CHECK_ECJ(${withval})
+ IT_CHECK_ECJ(${withval})
else
if test "x${withval}" != xno; then
- CLASSPATH_CHECK_ECJ
+ IT_CHECK_ECJ
fi
fi
- user_specified_javac=ecj
],
[
- CLASSPATH_CHECK_ECJ
+ IT_CHECK_ECJ
])
- JAVAC="${ECJ} -nowarn"
- AC_SUBST(JAVAC)
+ if test "x${JAVAC}" = "x"; then
+ if test "x{ECJ}" != "x"; then
+ JAVAC="${ECJ} -nowarn"
+ fi
+ fi
])
-AC_DEFUN([CLASSPATH_CHECK_ECJ],
+AC_DEFUN([IT_CHECK_ECJ],
[
if test "x$1" != x; then
if test -f "$1"; then
+ AC_MSG_CHECKING(for ecj)
ECJ="$1"
+ AC_MSG_RESULT(${ECJ})
else
AC_PATH_PROG(ECJ, "$1")
fi
@@ -184,31 +188,31 @@ AC_DEFUN([CLASSPATH_CHECK_ECJ],
fi
])
-AC_DEFUN([CLASSPATH_WITH_JAVAC],
+AC_DEFUN([IT_FIND_JAVAC],
[
AC_ARG_WITH([javac],
[AS_HELP_STRING(--with-javac,bytecode compilation with javac)],
[
if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
- CLASSPATH_CHECK_JAVAC(${withval})
+ IT_CHECK_JAVAC(${withval})
else
if test "x${withval}" != xno; then
- CLASSPATH_CHECK_JAVAC
+ IT_CHECK_JAVAC
fi
fi
- user_specified_javac=javac
],
[
- CLASSPATH_CHECK_JAVAC
+ IT_CHECK_JAVAC
])
- AC_SUBST(JAVAC)
])
-AC_DEFUN([CLASSPATH_CHECK_JAVAC],
+AC_DEFUN([IT_CHECK_JAVAC],
[
if test "x$1" != x; then
if test -f "$1"; then
+ AC_MSG_CHECKING(for javac)
JAVAC="$1"
+ AC_MSG_RESULT(${JAVAC})
else
AC_PATH_PROG(JAVAC, "$1")
fi
@@ -219,20 +223,18 @@ AC_DEFUN([CLASSPATH_CHECK_JAVAC],
AC_DEFUN([FIND_JAVA],
[
+ AC_MSG_CHECKING(for java)
AC_ARG_WITH([java],
[AS_HELP_STRING(--with-java,specify location of the 1.5 java vm)],
[
- if test -f "${withval}"; then
- AC_MSG_CHECKING(java)
- JAVA="${withval}"
- AC_MSG_RESULT(${withval})
- else
- AC_PATH_PROG(JAVA, "${withval}")
- fi
+ JAVA="${withval}"
],
[
- JAVA=
+ JAVA=${SYSTEM_JDK_DIR}/bin/java
])
+ if ! test -f "${JAVA}"; then
+ AC_PATH_PROG(JAVA, "${JAVA}")
+ fi
if test -z "${JAVA}"; then
AC_PATH_PROG(JAVA, "gij")
fi
@@ -242,6 +244,7 @@ AC_DEFUN([FIND_JAVA],
if test -z "${JAVA}"; then
AC_MSG_ERROR("A 1.5-compatible Java VM is required.")
fi
+ AC_MSG_RESULT(${JAVA})
AC_SUBST(JAVA)
])
@@ -358,26 +361,17 @@ AC_DEFUN([AC_CHECK_GCC_VERSION],
AC_DEFUN([FIND_JAVAH],
[
- AC_MSG_CHECKING([if a javah executable is specified])
+ AC_MSG_CHECKING([for javah])
AC_ARG_WITH([javah],
- [AS_HELP_STRING(--with-javah,specify location of javah)],
+ [AS_HELP_STRING(--with-javah,specify location of the Java header generator)],
[
- if test "x${withval}" = "xyes"; then
- JAVAH=no
- else
- JAVAH="${withval}"
- fi
+ JAVAH="${withval}"
],
[
- JAVAH=no
+ JAVAH=${SYSTEM_JDK_DIR}/bin/javah
])
- AC_MSG_RESULT(${JAVAH})
if ! test -f "${JAVAH}"; then
- if test "x${JAVAH}" = "xno"; then
- JAVAH=
- else
- AC_PATH_PROG(JAVAH, "${JAVAH}")
- fi
+ AC_PATH_PROG(JAVAH, "${JAVAH}")
fi
if test -z "${JAVAH}"; then
AC_PATH_PROG(JAVAH, "gjavah")
@@ -388,31 +382,23 @@ AC_DEFUN([FIND_JAVAH],
if test -z "${JAVAH}"; then
AC_MSG_ERROR("A Java header generator was not found.")
fi
+ AC_MSG_RESULT(${JAVAH})
AC_SUBST(JAVAH)
])
AC_DEFUN([FIND_JAR],
[
- AC_MSG_CHECKING([if a jar executable is specified])
+ AC_MSG_CHECKING([for jar])
AC_ARG_WITH([jar],
- [AS_HELP_STRING(--with-jar,specify location of jar)],
+ [AS_HELP_STRING(--with-jar,specify location of Java archive tool (jar))],
[
- if test "x${withval}" = "xyes"; then
- JAR=no
- else
- JAR="${withval}"
- fi
+ JAR="${withval}"
],
[
- JAR=no
+ JAR=${SYSTEM_JDK_DIR}/bin/jar
])
- AC_MSG_RESULT(${JAR})
if ! test -f "${JAR}"; then
- if test "x${JAR}" = "xno"; then
- JAR=
- else
- AC_PATH_PROG(JAR, "${JAR}")
- fi
+ AC_PATH_PROG(JAR, "${JAR}")
fi
if test -z "${JAR}"; then
AC_PATH_PROG(JAR, "gjar")
@@ -421,8 +407,9 @@ AC_DEFUN([FIND_JAR],
AC_PATH_PROG(JAR, "jar")
fi
if test -z "${JAR}"; then
- AC_MSG_ERROR("A jar tool was not found.")
+ AC_MSG_ERROR("No Java archive tool was found.")
fi
+ AC_MSG_RESULT(${JAR})
AC_MSG_CHECKING([whether jar supports @<file> argument])
touch _config.txt
cat >_config.list <<EOF
@@ -461,26 +448,17 @@ EOF
AC_DEFUN([FIND_RMIC],
[
- AC_MSG_CHECKING(if an rmic executable is specified)
+ AC_MSG_CHECKING(for rmic)
AC_ARG_WITH([rmic],
- [AS_HELP_STRING(--with-rmic,specify location of rmic)],
+ [AS_HELP_STRING(--with-rmic,specify location of the RMI compiler)],
[
- if test "x${withval}" = "xyes"; then
- RMIC=no
- else
- RMIC="${withval}"
- fi
+ RMIC="${withval}"
],
[
- RMIC=no
+ RMIC=${SYSTEM_JDK_DIR}/bin/rmic
])
- AC_MSG_RESULT(${RMIC})
if ! test -f "${RMIC}"; then
- if test "x${RMIC}" = "xno"; then
- RMIC=
- else
- AC_PATH_PROG(RMIC, "${RMIC}")
- fi
+ AC_PATH_PROG(RMIC, "${RMIC}")
fi
if test -z "${RMIC}"; then
AC_PATH_PROG(RMIC, "grmic")
@@ -491,6 +469,7 @@ AC_DEFUN([FIND_RMIC],
if test -z "${RMIC}"; then
AC_MSG_ERROR("An RMI compiler was not found.")
fi
+ AC_MSG_RESULT(${RMIC})
AC_SUBST(RMIC)
])
@@ -1065,86 +1044,67 @@ AC_DEFUN([AC_CHECK_WITH_HG_REVISION],
AM_CONDITIONAL(WITH_HGREV, test "x${HGREV}" != "x")
])
-AC_DEFUN([AC_CHECK_FOR_GCJ_JDK],
+AC_DEFUN([IT_CHECK_IF_BOOTSTRAPPING],
[
- AC_MSG_CHECKING([for a GCJ JDK home directory])
- AC_ARG_WITH([gcj-home],
- [AS_HELP_STRING([--with-gcj-home],
- [gcj home directory \
- (default is /usr/lib/jvm/java-gcj or /usr/lib/jvm/gcj-jdk)])],
- [
+ AC_MSG_CHECKING([whether to build a bootstrap version first])
+ AC_ARG_ENABLE([bootstrap],
+ [AS_HELP_STRING(--disable-bootstrap, don't build a bootstrap version [[default=no]])],
+ [
+ case "${enableval}" in
+ no)
+ enable_bootstrap=no
+ ;;
+ *)
+ enable_bootstrap=yes
+ ;;
+ esac
+ ],
+ [
+ enable_bootstrap=yes
+ ])
+ AC_MSG_RESULT([${enable_bootstrap}])
+ AM_CONDITIONAL([BOOTSTRAPPING], test x"${enable_bootstrap}" = "xyes")
+])
+
+AC_DEFUN([IT_CHECK_FOR_JDK],
+[
+ AC_MSG_CHECKING([for a JDK home directory])
+ AC_ARG_WITH([jdk-home],
+ [AS_HELP_STRING([--with-jdk-home],
+ [jdk home directory \
+ (default is first predefined JDK found)])],
+ [
if test "x${withval}" = xyes
then
- SYSTEM_GCJ_DIR=
+ SYSTEM_JDK_DIR=
elif test "x${withval}" = xno
then
- SYSTEM_GCJ_DIR=
+ SYSTEM_JDK_DIR=
else
- SYSTEM_GCJ_DIR=${withval}
+ SYSTEM_JDK_DIR=${withval}
fi
],
[
- SYSTEM_GCJ_DIR=
+ SYSTEM_JDK_DIR=
])
- if test -z "${SYSTEM_GCJ_DIR}"; then
- for dir in /usr/lib/jvm/java-gcj /usr/lib/jvm/gcj-jdk /usr/lib/jvm/cacao ; do
+ if test -z "${SYSTEM_JDK_DIR}"; then
+ if test "x${enable_bootstrap}" = "xyes"; then
+ BOOTSTRAP_VMS="/usr/lib/jvm/java-gcj /usr/lib/jvm/gcj-jdk /usr/lib/jvm/cacao";
+ fi
+ for dir in ${BOOTSTRAP_VMS} /usr/lib/jvm/java-openjdk \
+ /usr/lib/jvm/icedtea6 /usr/lib/jvm/java-6-openjdk \
+ /usr/lib/jvm/openjdk /usr/lib/jvm/java-icedtea ; do
if test -d $dir; then
- SYSTEM_GCJ_DIR=$dir
+ SYSTEM_JDK_DIR=$dir
break
fi
done
fi
- AC_MSG_RESULT(${SYSTEM_GCJ_DIR})
- if ! test -d "${SYSTEM_GCJ_DIR}"; then
- AC_MSG_ERROR("A GCJ JDK home directory could not be found.")
+ AC_MSG_RESULT(${SYSTEM_JDK_DIR})
+ if ! test -d "${SYSTEM_JDK_DIR}"; then
+ AC_MSG_ERROR("A JDK home directory could not be found.")
fi
- AC_SUBST(SYSTEM_GCJ_DIR)
-])
-
-dnl This option allows the initial build to be skipped, and a single build
-dnl to be completed using an existing OpenJDK installation. It can be used
-dnl in three ways:
-dnl * --with-openjdk: look for OpenJDK in one of a series of predefined dirs
-dnl * --without-openjdk (default): do a full bootstrap, no OpenJDK required
-dnl * --with-openjdk=${path}: use the OpenJDK installed in the specified location
-AC_DEFUN([AC_CHECK_FOR_OPENJDK],
-[
- AC_MSG_CHECKING([for an existing OpenJDK installation])
- AC_ARG_WITH([openjdk],
- [AS_HELP_STRING([--with-openjdk[=DIR]],
- [perform a quick build with an installed copy of OpenJDK])],
More information about the distro-pkg-dev
mailing list