This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
PATCH: Libjava is broken again
- From: "H. J. Lu" <hjl at lucon dot org>
- To: doko at ubuntu dot com
- Cc: gcc-patches at gcc dot gnu dot org, java-patches at gcc dot gnu dot org
- Date: Sun, 3 Jun 2007 20:45:31 -0700
- Subject: PATCH: Libjava is broken again
- References: <20070604030226.GA26134@lucon.org>
On Sun, Jun 03, 2007 at 08:02:26PM -0700, H. J. Lu wrote:
> This patch
>
> http://gcc.gnu.org/ml/gcc-patches/2007-06/msg00151.html
>
> breaks libjava. One problem is it modifies
>
> libjava/classpath/m4/acinclude.m4
>
> without ChangeLog entry. I believe this one
>
> - if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${user_specified_javac}" != xkjc && test "x${user_specified_javac}" != xgcjx && test "x${user_specified_javac}" != xecj; then
> - AC_MSG_ERROR([cannot find javac, try --with-gcj, --with-jikes, --with-kjc, --with-ecj, or --with-gcjx])
> +dnl if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${user_specified_javac}" != xkjc; then
> + if test "x${ECJ}" = x && test "x${JAVAC}" = x && test "x${user_specified_javac}" != xecj; then
>
> changes to check ${ECJ} instead of ${GCJ}, which breaks libjava
> build.
>
>
This patch works for me.
H.J.
----
2007-06-03 H.J. Lu <hongjiu.lu@intel.com>
* m4/acinclude.m4 (CLASSPATH_FIND_JAVAC): Check ${GCJ} instead
of ${ECJ}.
* aclocal.m4: Regenerated.
* configure: Likewise.
--- libjava/classpath/m4/acinclude.m4.bad 2007-06-03 18:48:59.000000000 -0700
+++ libjava/classpath/m4/acinclude.m4 2007-06-03 20:37:25.000000000 -0700
@@ -24,8 +24,8 @@ AC_DEFUN([CLASSPATH_FIND_JAVAC],
fi
AM_CONDITIONAL(FOUND_KJC, test "x${user_specified_javac}" = xkjc)
-dnl if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${user_specified_javac}" != xkjc; then
- if test "x${ECJ}" = x && test "x${JAVAC}" = x && test "x${user_specified_javac}" != xecj; then
+ if test "x${GCJ}" = x && test "x${JIKES}" = x && test "x${user_specified_javac}" != xkjc; then
+dnl 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])
fi
])