/hg/release/icedtea6-1.7: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Jan 15 18:06:41 PST 2010
changeset 02cf6e66f081 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=02cf6e66f081
author: Andrew John Hughes <ahughes at redhat.com>
date: Sat Jan 16 01:45:00 2010 +0000
Cleanup quoting and output of configure macros and make them less
error-prone.
2010-01-16 Andrew John Hughes <ahughes at redhat.com>
configure output and option cleanup
* Makefile.am: Change !ENABLE_OPTIMIZATIONS to
DISABLE_OPTIMIZATIONS.
* acinclude.m4: (FIND_ECJ_JAR): Always produce output,
not just when explicitly specified. (FIND_JAVAH): Handle the
yes and no possibilities better. (FIND_JAR):
Likewise. (FIND_RMIC): Likewise.
(WITH_OPENJDK_SRC_ZIP): Quote checking output.
(WITH_ALT_JAR_BINARY): Likewise. (FIND_XALAN2_JAR): Improve
wording. (FIND_XALAN2_SERIALIZER_JAR): Likewise.
(FIND_XERCES_JAR): Likewise. (FIND_NETBEANS): Handle yes and
no possibilities better. (FIND_RHINO_JAR): Quote
checking output. (ENABLE_OPTIMIZATIONS): Rename to
DISABLE_OPTIMIZATIONS for clarity. (ENABLE_ZERO_BUILD):
Quote checking output. (AC_CHECK_WITH_CACAO_SRC_ZIP):
Likewise. (AC_CHECK_WITH_CACAO_SRC_DIR): Likewise.
(WITH_OPENJDK): Complete output with no when not specified.
(IT_CHECK_ADDITIONAL_VMS): Moved to a macro from
configure.ac (IT_CHECK_NUMBER_OF_PARALLEL_JOBS): Likewise.
* configure.ac: Invoke new macros. Quote output and correct
typos. Perform IT_CHECK_ADDITIONAL_VMS earlier with Shark,
Zero and CACAO checks.
changeset bd63913c82ad in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=bd63913c82ad
author: Andrew John Hughes <ahughes at redhat.com>
date: Sat Jan 16 01:48:41 2010 +0000
Record errors to config.log rather than /dev/null.
2010-01-16 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4: Send output to AS_MESSAGE_LOG_FD
rather than /dev/null so we have a record of errors.
changeset 882587aab813 in /hg/release/icedtea6-1.7
details: http://icedtea.classpath.org/hg/release/icedtea6-1.7?cmd=changeset;node=882587aab813
author: Andrew John Hughes <ahughes at redhat.com>
date: Sat Jan 16 02:12:30 2010 +0000
Handle yes/no correctly in --with-parallel-jobs.
2010-01-16 Andrew John Hughes <ahughes at redhat.com>
* acinclude.m4: (IT_CHECK_NUMBER_OF_PARALLEL_JOBS):
Handle --with-parallel-jobs and
--without-parallel-jobs correctly.
--with-parallel-jobs (no arguments) uses available processors
+ 1, while
--without-parallel-jobs (the default) uses 2.
(IT_FIND_NUMBER_OF_PROCESSORS): Dependency of above. Uses
getconf to obtain the number of available processors.
diffstat:
4 files changed, 276 insertions(+), 169 deletions(-)
ChangeLog | 57 ++++++++++
Makefile.am | 4
acinclude.m4 | 306 +++++++++++++++++++++++++++++++++++++++-------------------
configure.ac | 78 ++------------
diffs (truncated from 774 to 500 lines):
diff -r adf8932ab9c3 -r 882587aab813 ChangeLog
--- a/ChangeLog Fri Jan 15 17:27:16 2010 +0000
+++ b/ChangeLog Sat Jan 16 02:12:30 2010 +0000
@@ -1,4 +1,59 @@ 2010-01-15 Edard Nevill <ed at camswl.com>
-2010-01-15 Edard Nevill <ed at camswl.com>
+2010-01-16 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ (IT_CHECK_NUMBER_OF_PARALLEL_JOBS):
+ Handle --with-parallel-jobs and
+ --without-parallel-jobs correctly.
+ --with-parallel-jobs (no arguments) uses
+ available processors + 1, while
+ --without-parallel-jobs (the default) uses 2.
+ (IT_FIND_NUMBER_OF_PROCESSORS):
+ Dependency of above. Uses getconf to
+ obtain the number of available processors.
+
+2010-01-16 Andrew John Hughes <ahughes at redhat.com>
+
+ * acinclude.m4:
+ Send output to AS_MESSAGE_LOG_FD rather
+ than /dev/null so we have a record of errors.
+
+2010-01-16 Andrew John Hughes <ahughes at redhat.com>
+
+ configure output and option cleanup
+ * Makefile.am:
+ Change !ENABLE_OPTIMIZATIONS to
+ DISABLE_OPTIMIZATIONS.
+ * acinclude.m4:
+ (FIND_ECJ_JAR): Always produce output,
+ not just when explicitly specified.
+ (FIND_JAVAH): Handle the yes and no
+ possibilities better.
+ (FIND_JAR): Likewise.
+ (FIND_RMIC): Likewise.
+ (WITH_OPENJDK_SRC_ZIP): Quote checking output.
+ (WITH_ALT_JAR_BINARY): Likewise.
+ (FIND_XALAN2_JAR): Improve wording.
+ (FIND_XALAN2_SERIALIZER_JAR): Likewise.
+ (FIND_XERCES_JAR): Likewise.
+ (FIND_NETBEANS): Handle yes and no
+ possibilities better.
+ (FIND_RHINO_JAR): Quote checking output.
+ (ENABLE_OPTIMIZATIONS): Rename to
+ DISABLE_OPTIMIZATIONS for clarity.
+ (ENABLE_ZERO_BUILD): Quote checking output.
+ (AC_CHECK_WITH_CACAO_SRC_ZIP): Likewise.
+ (AC_CHECK_WITH_CACAO_SRC_DIR): Likewise.
+ (WITH_OPENJDK): Complete output
+ with no when not specified.
+ (IT_CHECK_ADDITIONAL_VMS): Moved to a macro
+ from configure.ac
+ (IT_CHECK_NUMBER_OF_PARALLEL_JOBS): Likewise.
+ * configure.ac:
+ Invoke new macros. Quote output and correct
+ typos. Perform IT_CHECK_ADDITIONAL_VMS earlier
+ with Shark, Zero and CACAO checks.
+
+2010-01-15 Edward Nevill <ed at camswl.com>
* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
Implement is_allocatable to make build word with hs16
diff -r adf8932ab9c3 -r 882587aab813 Makefile.am
--- a/Makefile.am Fri Jan 15 17:27:16 2010 +0000
+++ b/Makefile.am Sat Jan 16 02:12:30 2010 +0000
@@ -429,7 +429,7 @@ ICEDTEA_ENV += \
ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
endif
-if !ENABLE_OPTIMIZATIONS
+if DISABLE_OPTIMIZATIONS
ICEDTEA_ENV += \
NO_OPTIMIZATIONS="true" \
CC_NO_OPT="-O0 -g"
@@ -508,7 +508,7 @@ ICEDTEA_ENV_ECJ += \
ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
endif
-if !ENABLE_OPTIMIZATIONS
+if DISABLE_OPTIMIZATIONS
ICEDTEA_ENV_ECJ += \
NO_OPTIMIZATIONS="true" \
CC_NO_OPT="-O0 -g"
diff -r adf8932ab9c3 -r 882587aab813 acinclude.m4
--- a/acinclude.m4 Fri Jan 15 17:27:16 2010 +0000
+++ b/acinclude.m4 Sat Jan 16 02:12:30 2010 +0000
@@ -238,41 +238,33 @@ AC_DEFUN([WITH_OPENJDK_SRC_DIR],
AC_DEFUN([FIND_ECJ_JAR],
[
+ AC_MSG_CHECKING([for an ecj JAR file])
AC_ARG_WITH([ecj-jar],
[AS_HELP_STRING(--with-ecj-jar,specify location of the ECJ jar)],
[
if test -f "${withval}"; then
- AC_MSG_CHECKING(for an ecj jar)
ECJ_JAR="${withval}"
- AC_MSG_RESULT(${withval})
fi
],
[
ECJ_JAR=
])
if test -z "${ECJ_JAR}"; then
- AC_MSG_CHECKING(for eclipse-ecj.jar)
- if test -e "/usr/share/java/eclipse-ecj.jar"; then
- ECJ_JAR=/usr/share/java/eclipse-ecj.jar
- AC_MSG_RESULT(${ECJ_JAR})
- elif test -e "/usr/share/java/ecj.jar"; then
- ECJ_JAR=/usr/share/java/ecj.jar
- AC_MSG_RESULT(${ECJ_JAR})
- elif test -e "/usr/share/eclipse-ecj-3.3/lib/ecj.jar"; then
- ECJ_JAR=/usr/share/eclipse-ecj-3.3/lib/ecj.jar
- AC_MSG_RESULT(${ECJ_JAR})
- elif test -e "/usr/share/eclipse-ecj-3.2/lib/ecj.jar"; then
- ECJ_JAR=/usr/share/eclipse-ecj-3.2/lib/ecj.jar
- AC_MSG_RESULT(${ECJ_JAR})
- elif test -e "/usr/share/eclipse-ecj-3.1/lib/ecj.jar"; then
- ECJ_JAR=/usr/share/eclipse-ecj-3.1/lib/ecj.jar
- AC_MSG_RESULT(${ECJ_JAR})
- else
- AC_MSG_RESULT(no)
- fi
- fi
- if test -z "${ECJ_JAR}"; then
- AC_MSG_ERROR("A ECJ jar was not found.")
+ for jar in /usr/share/java/eclipse-ecj.jar \
+ /usr/share/java/ecj.jar \
+ /usr/share/eclipse-ecj-3.{2,3,4,5}/lib/ecj.jar; do
+ if test -e $jar; then
+ ECJ_JAR=$jar
+ break
+ fi
+ done
+ if test -z "${ECJ_JAR}"; then
+ ECJ_JAR=no
+ fi
+ fi
+ AC_MSG_RESULT(${ECJ_JAR})
+ if test "x${ECJ_JAR}" = "xno"; then
+ AC_MSG_ERROR("No compiler or ecj JAR file was found.")
fi
AC_SUBST(ECJ_JAR)
])
@@ -289,20 +281,27 @@ AC_DEFUN([AC_CHECK_GCC_VERSION],
AC_DEFUN([FIND_JAVAH],
[
+ AC_MSG_CHECKING([if a javah executable is specified])
AC_ARG_WITH([javah],
- [AS_HELP_STRING(--with-javah,specify location of the javah)],
- [
- if test -f "${withval}"; then
- AC_MSG_CHECKING(for javah)
+ [AS_HELP_STRING(--with-javah,specify location of javah)],
+ [
+ if test "x${withval}" = "xyes"; then
+ JAVAH=no
+ else
JAVAH="${withval}"
- AC_MSG_RESULT(${withval})
- else
- AC_PATH_PROG(JAVAH, "${withval}")
- fi
- ],
- [
- JAVAH=
- ])
+ fi
+ ],
+ [
+ JAVAH=no
+ ])
+ AC_MSG_RESULT(${JAVAH})
+ if ! test -f "${JAVAH}"; then
+ if test "x${JAVAH}" = "xno"; then
+ JAVAH=
+ else
+ AC_PATH_PROG(JAVAH, "${JAVAH}")
+ fi
+ fi
if test -z "${JAVAH}"; then
AC_PATH_PROG(JAVAH, "gjavah")
fi
@@ -310,27 +309,34 @@ AC_DEFUN([FIND_JAVAH],
AC_PATH_PROG(JAVAH, "javah")
fi
if test -z "${JAVAH}"; then
- AC_MSG_ERROR("javah was not found.")
+ AC_MSG_ERROR("A Java header generator was not found.")
fi
AC_SUBST(JAVAH)
])
AC_DEFUN([FIND_JAR],
[
+ AC_MSG_CHECKING([if a jar executable is specified])
AC_ARG_WITH([jar],
- [AS_HELP_STRING(--with-jar,specify location of the jar)],
- [
- if test -f "${withval}"; then
- AC_MSG_CHECKING(for jar)
+ [AS_HELP_STRING(--with-jar,specify location of jar)],
+ [
+ if test "x${withval}" = "xyes"; then
+ JAR=no
+ else
JAR="${withval}"
- AC_MSG_RESULT(${withval})
- else
- AC_PATH_PROG(JAR, "${withval}")
- fi
- ],
- [
- JAR=
- ])
+ fi
+ ],
+ [
+ JAR=no
+ ])
+ AC_MSG_RESULT(${JAR})
+ if ! test -f "${JAR}"; then
+ if test "x${JAR}" = "xno"; then
+ JAR=
+ else
+ AC_PATH_PROG(JAR, "${JAR}")
+ fi
+ fi
if test -z "${JAR}"; then
AC_PATH_PROG(JAR, "gjar")
fi
@@ -338,14 +344,14 @@ AC_DEFUN([FIND_JAR],
AC_PATH_PROG(JAR, "jar")
fi
if test -z "${JAR}"; then
- AC_MSG_ERROR("jar was not found.")
+ AC_MSG_ERROR("A jar tool was not found.")
fi
AC_MSG_CHECKING([whether jar supports @<file> argument])
touch _config.txt
cat >_config.list <<EOF
_config.txt
EOF
- if $JAR cf _config.jar @_config.list 2>/dev/null; then
+ if $JAR cf _config.jar @_config.list 2>&AS_MESSAGE_LOG_FD; then
JAR_KNOWS_ATFILE=1
AC_MSG_RESULT(yes)
else
@@ -353,7 +359,7 @@ EOF
AC_MSG_RESULT(no)
fi
AC_MSG_CHECKING([whether jar supports stdin file arguments])
- if cat _config.list | $JAR cf@ _config.jar 2>/dev/null; then
+ if cat _config.list | $JAR cf@ _config.jar 2>&AS_MESSAGE_LOG_FD; then
JAR_ACCEPTS_STDIN_LIST=1
AC_MSG_RESULT(yes)
else
@@ -362,7 +368,7 @@ EOF
fi
rm -f _config.list _config.jar
AC_MSG_CHECKING([whether jar supports -J options at the end])
- if $JAR cf _config.jar _config.txt -J-Xmx896m 2>/dev/null; then
+ if $JAR cf _config.jar _config.txt -J-Xmx896m 2>&AS_MESSAGE_LOG_FD; then
JAR_KNOWS_J_OPTIONS=1
AC_MSG_RESULT(yes)
else
@@ -378,20 +384,27 @@ EOF
AC_DEFUN([FIND_RMIC],
[
+ AC_MSG_CHECKING(if an rmic executable is specified)
AC_ARG_WITH([rmic],
- [AS_HELP_STRING(--with-rmic,specify location of the rmic)],
- [
- if test -f "${withval}"; then
- AC_MSG_CHECKING(for rmic)
+ [AS_HELP_STRING(--with-rmic,specify location of rmic)],
+ [
+ if test "x${withval}" = "xyes"; then
+ RMIC=no
+ else
RMIC="${withval}"
- AC_MSG_RESULT(${withval})
- else
- AC_PATH_PROG(RMIC, "${withval}")
- fi
- ],
- [
- RMIC=
- ])
+ fi
+ ],
+ [
+ RMIC=no
+ ])
+ AC_MSG_RESULT(${RMIC})
+ if ! test -f "${RMIC}"; then
+ if test "x${RMIC}" = "xno"; then
+ RMIC=
+ else
+ AC_PATH_PROG(RMIC, "${RMIC}")
+ fi
+ fi
if test -z "${RMIC}"; then
AC_PATH_PROG(RMIC, "grmic")
fi
@@ -399,7 +412,7 @@ AC_DEFUN([FIND_RMIC],
AC_PATH_PROG(RMIC, "rmic")
fi
if test -z "${RMIC}"; then
- AC_MSG_ERROR("rmic was not found.")
+ AC_MSG_ERROR("An RMI compiler was not found.")
fi
AC_SUBST(RMIC)
])
@@ -446,7 +459,7 @@ AC_DEFUN([FIND_ENDORSED_JARS],
AC_DEFUN([WITH_OPENJDK_SRC_ZIP],
[
- AC_MSG_CHECKING(for an 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)],
[
@@ -463,7 +476,7 @@ AC_DEFUN([WITH_OPENJDK_SRC_ZIP],
AC_DEFUN([WITH_ALT_JAR_BINARY],
[
- AC_MSG_CHECKING(for an 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)],
[
@@ -480,7 +493,7 @@ AC_DEFUN([WITH_ALT_JAR_BINARY],
AC_DEFUN([FIND_XALAN2_JAR],
[
- AC_MSG_CHECKING(xalan2 jar)
+ AC_MSG_CHECKING([for a xalan2 jar])
AC_ARG_WITH([xalan2-jar],
[AS_HELP_STRING(--with-xalan2-jar,specify location of the xalan2 jar)],
[
@@ -511,7 +524,7 @@ AC_DEFUN([FIND_XALAN2_JAR],
AC_DEFUN([FIND_XALAN2_SERIALIZER_JAR],
[
- AC_MSG_CHECKING(for xalan2 serializer jar)
+ AC_MSG_CHECKING([for a xalan2 serializer jar])
AC_ARG_WITH([xalan2-serializer-jar],
[AS_HELP_STRING(--with-xalan2-serializer-jar,specify location of the xalan2-serializer jar)],
[
@@ -542,7 +555,7 @@ AC_DEFUN([FIND_XALAN2_SERIALIZER_JAR],
AC_DEFUN([FIND_XERCES2_JAR],
[
- AC_MSG_CHECKING(for xerces2 jar)
+ AC_MSG_CHECKING([for a xerces2 jar])
AC_ARG_WITH([xerces2-jar],
[AS_HELP_STRING(--with-xerces2-jar,specify location of the xerces2 jar)],
[
@@ -575,20 +588,27 @@ AC_DEFUN([FIND_XERCES2_JAR],
AC_DEFUN([FIND_NETBEANS],
[
+ AC_MSG_CHECKING([if the location of NetBeans is specified])
AC_ARG_WITH([netbeans],
[AS_HELP_STRING(--with-netbeans,specify location of netbeans)],
[
- if test -f "${withval}"; then
- AC_MSG_CHECKING(netbeans)
+ if test "x${withval}" = "xyes"; then
+ NETBEANS=no
+ else
NETBEANS="${withval}"
- AC_MSG_RESULT(${withval})
- else
- AC_PATH_PROG(NETBEANS, "${withval}")
- fi
- ],
- [
- NETBEANS=
- ])
+ fi
+ ],
+ [
+ NETBEANS=no
+ ])
+ AC_MSG_RESULT(${NETBEANS})
+ if ! test -f "${NETBEANS}"; then
+ if test "x${NETBEANS}" = "xno"; then
+ NETBEANS=
+ else
+ AC_PATH_PROG(NETBEANS, "${NETBEANS}")
+ fi
+ fi
if test -z "${NETBEANS}"; then
AC_PATH_PROG(NETBEANS, "netbeans")
fi
@@ -600,7 +620,7 @@ AC_DEFUN([FIND_NETBEANS],
AC_DEFUN([FIND_RHINO_JAR],
[
- AC_MSG_CHECKING(whether to include Javascript support via Rhino)
+ AC_MSG_CHECKING([whether to include Javascript support via Rhino])
AC_ARG_WITH([rhino],
[AS_HELP_STRING(--with-rhino,specify location of the rhino jar)],
[
@@ -642,27 +662,26 @@ AC_DEFUN([FIND_RHINO_JAR],
AC_SUBST(RHINO_JAR)
])
-AC_DEFUN([ENABLE_OPTIMIZATIONS],
-[
- AC_MSG_CHECKING(whether to disable optimizations)
+AC_DEFUN([DISABLE_OPTIMIZATIONS],
+[
+ AC_MSG_CHECKING([whether to disable optimizations and build with -O0 -g])
AC_ARG_ENABLE([optimizations],
[AS_HELP_STRING(--disable-optimizations,build with -O0 -g [[default=no]])],
[
case "${enableval}" in
no)
- AC_MSG_RESULT([yes, building with -O0 -g])
- enable_optimizations=no
+ disable_optimizations=yes
;;
*)
- AC_MSG_RESULT([no])
- enable_optimizations=yes
+ disable_optimizations=no
;;
esac
],
[
- enable_optimizations=yes
- ])
- AM_CONDITIONAL([ENABLE_OPTIMIZATIONS], test x"${enable_optimizations}" = "xyes")
+ disable_optimizations=no
+ ])
+ AC_MSG_RESULT([$disable_optimizations])
+ AM_CONDITIONAL([DISABLE_OPTIMIZATIONS], test x"${disable_optimizations}" = "xyes")
])
AC_DEFUN([FIND_TOOL],
@@ -675,7 +694,7 @@ AC_DEFUN([FIND_TOOL],
AC_DEFUN([ENABLE_ZERO_BUILD],
[
- AC_MSG_CHECKING(whether to use the zero-assembler port)
+ AC_MSG_CHECKING([whether to use the zero-assembler port])
use_zero=no
AC_ARG_ENABLE([zero],
[AS_HELP_STRING(--enable-zero,
@@ -805,7 +824,7 @@ AC_DEFUN([AC_CHECK_ENABLE_CACAO],
AC_DEFUN([AC_CHECK_WITH_CACAO_HOME],
[
- AC_MSG_CHECKING(for CACAO home directory)
+ AC_MSG_CHECKING([for a CACAO home directory])
AC_ARG_WITH([cacao-home],
[AS_HELP_STRING([--with-cacao-home],
[CACAO home directory [[default=/usr/local/cacao]]])],
@@ -830,7 +849,7 @@ AC_DEFUN([AC_CHECK_WITH_CACAO_HOME],
AC_DEFUN([AC_CHECK_WITH_CACAO_SRC_ZIP],
[
- AC_MSG_CHECKING(for a 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)],
[
@@ -847,7 +866,7 @@ AC_DEFUN([AC_CHECK_WITH_CACAO_SRC_ZIP],
AC_DEFUN([AC_CHECK_WITH_CACAO_SRC_DIR],
[
- AC_MSG_CHECKING(for a Cacao source directory)
+ AC_MSG_CHECKING([for a CACAO source directory])
AC_ARG_WITH([cacao-src-dir],
[AS_HELP_STRING(--with-cacao-src-dir,specify the location of the Cacao sources)],
[
@@ -1009,7 +1028,7 @@ AC_DEFUN([AC_CHECK_FOR_OPENJDK],
[
if test "x${withval}" = xno
then
- SYSTEM_OPENJDK_DIR=
+ SYSTEM_OPENJDK_DIR=no
with_openjdk=false
else
SYSTEM_OPENJDK_DIR=${withval}
@@ -1017,7 +1036,7 @@ AC_DEFUN([AC_CHECK_FOR_OPENJDK],
fi
],
[
- SYSTEM_OPENJDK_DIR=
+ SYSTEM_OPENJDK_DIR=no
with_openjdk=false
])
More information about the distro-pkg-dev
mailing list