/hg/icedtea: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Dec 8 03:14:25 UTC 2015
changeset 87452b5a37fb in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=87452b5a37fb
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Dec 08 03:09:43 2015 +0000
PR1377: Forwardport javac detection / usability test from IcedTea 2.x
2015-12-07 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR1377: Forwardport javac detection / usability
test from IcedTea 2.x
* NEWS: Updated.
2012-03-20 Andrew John Hughes <ahughes at redhat.com>
PR1377: Forwardport javac detection / usability
test from IcedTea 2.x
* acinclude.m4:
(IT_FIND_COMPILER): Define only once and
rename from IT_FIND_JAVA_COMPILER. Move
default value for javac into its own macro.
(IT_FIND_ECJ): Use same form as detection
for java, javah, jar and rmic.
(IT_FIND_JAVAC): Likewise.
(IT_FIND_JAVA): Define only once.
(IT_CHECK_JAVA_AND_JAVAC_WORK): New macro to check
java and javac actually work together to compile code
before running other tests such as the dtdtype one.
(IT_CHECK_FOR_CLASS): Depend on java/javac working.
* configure.ac: Invoke IT_FIND_COMPILER rather than
IT_FIND_JAVA_COMPILER.
changeset f988c0fa5312 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=f988c0fa5312
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Dec 08 03:14:09 2015 +0000
Add G564746 to PR2691 distcc bug.
2015-12-07 Andrew John Hughes <gnu.andrew at member.fsf.org>
* NEWS: Add G564746 to PR2691 distcc bug.
diffstat:
ChangeLog | 29 ++++++++++++
NEWS | 3 +-
acinclude.m4 | 132 ++++++++++++++++++++++++++++++++++++----------------------
configure.ac | 2 +-
4 files changed, 114 insertions(+), 52 deletions(-)
diffs (262 lines):
diff -r 83294693e764 -r f988c0fa5312 ChangeLog
--- a/ChangeLog Mon Dec 07 04:22:18 2015 +0000
+++ b/ChangeLog Tue Dec 08 03:14:09 2015 +0000
@@ -1,3 +1,32 @@
+2015-12-07 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * NEWS: Add G564746 to PR2691 distcc bug.
+
+2015-12-07 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ PR1377: Forwardport javac detection / usability
+ test from IcedTea 2.x
+ * NEWS: Updated.
+
+2012-03-20 Andrew John Hughes <ahughes at redhat.com>
+
+ PR1377: Forwardport javac detection / usability
+ test from IcedTea 2.x
+ * acinclude.m4:
+ (IT_FIND_COMPILER): Define only once and
+ rename from IT_FIND_JAVA_COMPILER. Move
+ default value for javac into its own macro.
+ (IT_FIND_ECJ): Use same form as detection
+ for java, javah, jar and rmic.
+ (IT_FIND_JAVAC): Likewise.
+ (IT_FIND_JAVA): Define only once.
+ (IT_CHECK_JAVA_AND_JAVAC_WORK): New macro to check
+ java and javac actually work together to compile code
+ before running other tests such as the dtdtype one.
+ (IT_CHECK_FOR_CLASS): Depend on java/javac working.
+ * configure.ac: Invoke IT_FIND_COMPILER rather than
+ IT_FIND_JAVA_COMPILER.
+
2015-12-06 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
diff -r 83294693e764 -r f988c0fa5312 NEWS
--- a/NEWS Mon Dec 07 04:22:18 2015 +0000
+++ b/NEWS Tue Dec 08 03:14:09 2015 +0000
@@ -45,6 +45,7 @@
- PR1364: Replace hgforest support
- PR1367: Support using the system installation of LCMS
- PR1369: Remove outdated bootstrap configure tests or make them fail on error
+ - PR1377: Forwardport javac detection / usability test from IcedTea 2.x
- PR1379: Add build support for Zero AArch64
- PR1413: Undefined reference to libz during link of unpack200
- PR1766: Expand architecture support
@@ -112,7 +113,7 @@
- PR2631: jvm.cfg missing for ppc64le
- PR2633: s390 builds still fail as BUILD_NUM_BITS is never set
- PR2675: Update ppc64le autotools infrastructure following PR2237
- - PR2691: ./configure is unable to compile using distcc for icedtea-3.0.0_pre06
+ - PR2691, G564746: ./configure is unable to compile using distcc for icedtea-3.0.0_pre06
- PR2737: Allow multiple PKCS11 library initialisation to be a non-critical error.
- PR2738: java.lang.UnsatisfiedLinkError: no javalcms in java.library.path
- PR2743: Remove bad AArch64 merge fragment
diff -r 83294693e764 -r f988c0fa5312 acinclude.m4
--- a/acinclude.m4 Mon Dec 07 04:22:18 2015 +0000
+++ b/acinclude.m4 Tue Dec 08 03:14:09 2015 +0000
@@ -130,50 +130,41 @@
AC_SUBST(OS_PATH)
])
-AC_DEFUN([IT_FIND_JAVA_COMPILER],
+AC_DEFUN([IT_FIND_COMPILER],
[
- JAVAC=${SYSTEM_JDK_DIR}/bin/javac
IT_FIND_JAVAC
IT_FIND_ECJ
IT_USING_ECJ
+ AC_SUBST(ECJ)
AC_SUBST(JAVAC)
])
-AC_DEFUN([IT_FIND_ECJ],
+AC_DEFUN_ONCE([IT_FIND_ECJ],
[
+ ECJ_DEFAULT=/usr/bin/ecj
+ AC_MSG_CHECKING([if an ecj binary was specified])
AC_ARG_WITH([ecj],
- [AS_HELP_STRING([--with-ecj[[=PATH]]],the path to an ecj binary)],
+ [AS_HELP_STRING(--with-ecj,bytecode compilation with ecj)],
[
- if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
- IT_CHECK_ECJ(${withval})
+ if test "x${withval}" = "xyes"; then
+ ECJ=no
else
- if test "x${withval}" != xno; then
- IT_CHECK_ECJ
- fi
+ ECJ="${withval}"
fi
],
[
- IT_CHECK_ECJ
+ ECJ=no
])
- if test "x${JAVAC}" = "x"; then
- if test "x{ECJ}" != "x"; then
- JAVAC="${ECJ}"
- fi
+ AC_MSG_RESULT(${ECJ})
+ if test "x${ECJ}" = "xno"; then
+ ECJ=${ECJ_DEFAULT}
fi
-])
-
-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
+ AC_MSG_CHECKING([if $ECJ is a valid executable file])
+ if test -x "${ECJ}" && test -f "${ECJ}"; then
+ AC_MSG_RESULT([yes])
else
+ ECJ=""
AC_PATH_PROG(ECJ, "ecj")
if test -z "${ECJ}"; then
AC_PATH_PROG(ECJ, "ecj-3.1")
@@ -184,43 +175,45 @@
if test -z "${ECJ}"; then
AC_PATH_PROG(ECJ, "ecj-3.3")
fi
+ if test -z "${ECJ}"; then
+ AC_PATH_PROG(ECJ, "ecj-3.4")
+ fi
fi
])
-AC_DEFUN([IT_FIND_JAVAC],
+AC_DEFUN_ONCE([IT_FIND_JAVAC],
[
+ JAVAC_DEFAULT=${SYSTEM_JDK_DIR}/bin/javac
+ AC_MSG_CHECKING([if a javac binary was specified])
AC_ARG_WITH([javac],
[AS_HELP_STRING([--with-javac[[=PATH]]],the path to a javac binary)],
[
- if test "x${withval}" != x && test "x${withval}" != xyes && test "x${withval}" != xno; then
- IT_CHECK_JAVAC(${withval})
+ if test "x${withval}" = "xyes"; then
+ JAVAC=no
else
- if test "x${withval}" != xno; then
- IT_CHECK_JAVAC(${JAVAC})
- fi
+ JAVAC="${withval}"
fi
],
- [
- IT_CHECK_JAVAC(${JAVAC})
+ [
+ JAVAC=no
+ ])
+ AC_MSG_RESULT(${JAVAC})
+ if test "x${JAVAC}" = "xno"; then
+ JAVAC=${JAVAC_DEFAULT}
+ fi
+ AC_MSG_CHECKING([if $JAVAC is a valid executable file])
+ if test -x "${JAVAC}" && test -f "${JAVAC}"; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ JAVAC=""
+ AC_PATH_PROG(JAVAC, "javac")
+ fi
+ AC_SUBST(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
- else
- AC_PATH_PROG(JAVAC, "javac")
- fi
-])
-
-AC_DEFUN([IT_FIND_JAVA],
+AC_DEFUN_ONCE([IT_FIND_JAVA],
[
JAVA_DEFAULT=${SYSTEM_JDK_DIR}/bin/java
AC_MSG_CHECKING([if a java binary was specified])
@@ -1189,6 +1182,44 @@
AC_SUBST(ENABLE_WARNINGS)
])
+dnl check that javac and java work
+AC_DEFUN_ONCE([IT_CHECK_JAVA_AND_JAVAC_WORK],[
+ AC_REQUIRE([IT_FIND_JAVA])
+ AC_REQUIRE([IT_FIND_COMPILER])
+ AC_CACHE_CHECK([if the VM and compiler work together], it_cv_jdk_works, [
+ CLASS=Test.java
+ BYTECODE=$(echo $CLASS|sed 's#\.java##')
+ mkdir tmp.$$
+ cd tmp.$$
+ cat << \EOF > $CLASS
+[/* [#]line __oline__ "configure" */
+
+public class Test
+{
+ public static void main(String[] args)
+ {
+ System.out.println("Hello World!");
+ }
+}]
+EOF
+ if $JAVAC -cp . $JAVACFLAGS -source 5 -target 5 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then
+ if $JAVA -classpath . $BYTECODE >&AS_MESSAGE_LOG_FD 2>&1; then
+ it_cv_jdk_works=yes;
+ else
+ it_cv_jdk_works=no;
+ AC_MSG_ERROR([VM failed to run compiled class.])
+ fi
+ else
+ it_cv_jdk_works=no;
+ AC_MSG_ERROR([Compiler failed to compile Java code.])
+ fi
+ rm -f $CLASS *.class
+ cd ..
+ rmdir tmp.$$
+ ])
+AC_PROVIDE([$0])dnl
+])
+
dnl Generic macro to check for a Java class
dnl Takes two arguments: the name of the macro
dnl and the name of the class. The macro name
@@ -1196,6 +1227,7 @@
dnl replaced by '_' and all letters capitalised.
dnl e.g. IT_CHECK_FOR_CLASS([JAVA_UTIL_SCANNER],[java.util.Scanner])
AC_DEFUN([IT_CHECK_FOR_CLASS],[
+AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK])
AC_CACHE_CHECK([if $2 is missing], it_cv_$1, [
CLASS=Test.java
BYTECODE=$(echo $CLASS|sed 's#\.java##')
diff -r 83294693e764 -r f988c0fa5312 configure.ac
--- a/configure.ac Mon Dec 07 04:22:18 2015 +0000
+++ b/configure.ac Tue Dec 08 03:14:09 2015 +0000
@@ -93,7 +93,7 @@
IT_CHECK_IF_DOWNLOADING
IT_CHECK_FOR_JDK
IT_FIND_JAVA
-IT_FIND_JAVA_COMPILER
+IT_FIND_COMPILER
IT_FIND_JAVAH
IT_FIND_JAR
IT_FIND_RMIC
More information about the distro-pkg-dev
mailing list