Mercurial > hg > release > icedtea6-1.5

changeset 588:e67a14256163

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2008-02-05 Lillian Angel <langel@redhat.com> * Makefile.am: Only apply patches/icedtea-gcc-4.3.patch if libgcj-4.3.0.jar is installed. * Makefile.in: Regenerate. * acinclude.m4: If libgcj-4.3*.jar is not found, then search for libgcj-4.1*.jar and set LIBGCJ_OLD. * configure: Regenerate.
author Lillian Angel <langel@redhat.com>
date Tue, 05 Feb 2008 11:20:56 -0500
parents 942c462067e4
children 72326a478d03
files ChangeLog Makefile.am Makefile.in acinclude.m4 configure
diffstat 5 files changed, 93 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Feb 05 09:53:53 2008 -0500
+++ b/ChangeLog	Tue Feb 05 11:20:56 2008 -0500
@@ -1,3 +1,12 @@
+2008-02-05  Lillian Angel  <langel@redhat.com>
+
+	* Makefile.am: Only apply patches/icedtea-gcc-4.3.patch if
+	libgcj-4.3.0.jar is installed.
+	* Makefile.in: Regenerate.
+	* acinclude.m4: If libgcj-4.3*.jar is not found, then search for
+	libgcj-4.1*.jar and set LIBGCJ_OLD.
+	* configure: Regenerate.
+
 2008-02-05  Bernhard Rosenkränzer  <bero@arklinux.org>
 
 	* configure.ac: Added check for jar. If fastjar is not found, then jar
--- a/Makefile.am	Tue Feb 05 09:53:53 2008 -0500
+++ b/Makefile.am	Tue Feb 05 11:20:56 2008 -0500
@@ -180,6 +180,13 @@
   FAST_BUILD_PATCH =
 endif
 
+# If new libgcj is installed, apply 4.3 patch
+if LIBGCJ_OLD
+  GCC_PATCH =
+else
+  GCC_PATCH = patches/icedtea-gcc-4.3.patch
+endif
+
 ICEDTEA_PATCHES = \
 	patches/icedtea-copy-plugs.patch \
 	patches/icedtea-version.patch \
@@ -220,7 +227,7 @@
 	patches/icedtea-generated.patch \
 	patches/icedtea-lib64.patch \
 	patches/icedtea-zero.patch \
-	patches/icedtea-gcc-4.3.patch \
+	$(GCC_PATCH) \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
--- a/Makefile.in	Tue Feb 05 09:53:53 2008 -0500
+++ b/Makefile.in	Tue Feb 05 11:20:56 2008 -0500
@@ -107,6 +107,7 @@
 JAVAH = @JAVAH@
 LDFLAGS = @LDFLAGS@
 LIBGCJ_JAR = @LIBGCJ_JAR@
+LIBGCJ_OLD = @LIBGCJ_OLD@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
@@ -279,6 +280,10 @@
 
 # Patch OpenJDK sources for plug replacements.
 @FAST_BUILD_TRUE@FAST_BUILD_PATCH = patches/icedtea-speed.patch
+@LIBGCJ_OLD_FALSE@GCC_PATCH = patches/icedtea-gcc-4.3.patch
+
+# If new libgcj is installed, apply 4.3 patch
+@LIBGCJ_OLD_TRUE@GCC_PATCH = 
 ICEDTEA_PATCHES = \
 	patches/icedtea-copy-plugs.patch \
 	patches/icedtea-version.patch \
@@ -319,7 +324,7 @@
 	patches/icedtea-generated.patch \
 	patches/icedtea-lib64.patch \
 	patches/icedtea-zero.patch \
-	patches/icedtea-gcc-4.3.patch \
+	$(GCC_PATCH) \
 	$(FAST_BUILD_PATCH) \
 	$(DISTRIBUTION_PATCHES)
 
--- a/acinclude.m4	Tue Feb 05 09:53:53 2008 -0500
+++ b/acinclude.m4	Tue Feb 05 11:20:56 2008 -0500
@@ -197,7 +197,7 @@
 AC_DEFUN([FIND_LIBGCJ_JAR],
 [
   AC_ARG_WITH([libgcj-jar],
-              [AS_HELP_STRING(--with-libgcj-jar,specify location of the libgcj jar)],
+              [AS_HELP_STRING(--with-libgcj-jar,specify location of the libgcj 4.3.0 jar)],
   [
     if test -f "${withval}"; then
       AC_MSG_CHECKING(libgcj jar)
@@ -209,7 +209,8 @@
     LIBGCJ_JAR=
   ])
   if test -z "${LIBGCJ_JAR}"; then
-    AC_MSG_CHECKING(for libgcj-4.1.2.jar)
+    AM_CONDITIONAL(LIBGCJ_OLD, test x != x)
+    AC_MSG_CHECKING(for libgcj-4.3.0.jar or lib-4.1.2.jar)
     if test -e "/usr/share/java/libgcj-4.3.0.jar"; then
       LIBGCJ_JAR=/usr/share/java/libgcj-4.3.0.jar
       AC_MSG_RESULT(${LIBGCJ_JAR})
@@ -218,7 +219,18 @@
         LIBGCJ_JAR=/usr/share/java/libgcj-4.3.jar
 	AC_MSG_RESULT(${LIBGCJ_JAR})
       else
-        AC_MSG_RESULT(no)
+	AM_CONDITIONAL(LIBGCJ_OLD, test x = x)
+        if test -e "/usr/share/java/libgcj-4.1.2.jar"; then
+          LIBGCJ_JAR=/usr/share/java/libgcj-4.1.2.jar
+          AC_MSG_RESULT(${LIBGCJ_JAR})
+	else
+	  if test -e "/usr/share/java/libgcj-4.1.jar"; then
+            LIBGCJ_JAR=/usr/share/java/libgcj-4.1.jar
+            AC_MSG_RESULT(${LIBGCJ_JAR})
+	  else
+	    AC_MSG_RESULT(no)
+	  fi
+	fi
       fi
     fi
   fi
@@ -226,6 +238,7 @@
     AC_MSG_ERROR("A LIBGCJ jar was not found.")
   fi
   AC_SUBST(LIBGCJ_JAR)
+  AC_SUBST(LIBGCJ_OLD)
 ])
 
 AC_DEFUN([FIND_JAVAH],
--- a/configure	Tue Feb 05 09:53:53 2008 -0500
+++ b/configure	Tue Feb 05 11:20:56 2008 -0500
@@ -727,7 +727,10 @@
 RMIC
 ECJ
 ECJ_JAR
+LIBGCJ_OLD_TRUE
+LIBGCJ_OLD_FALSE
 LIBGCJ_JAR
+LIBGCJ_OLD
 XALAN2_JAR
 XALAN2_SERIALIZER_JAR
 XERCES2_JAR
@@ -1374,7 +1377,7 @@
   --with-jar              specify location of the jar
   --with-rmic             specify location of the rmic
   --with-ecj-jar          specify location of the ECJ jar
-  --with-libgcj-jar       specify location of the libgcj jar
+  --with-libgcj-jar       specify location of the libgcj 4.3.0 jar
   --with-xalan2-jar       specify location of the xalan2 jar
   --with-xalan2-serializer-jar
                           specify location of the xalan2-serializer jar
@@ -6575,8 +6578,16 @@
 fi
 
   if test -z "${LIBGCJ_JAR}"; then
-    { echo "$as_me:$LINENO: checking for libgcj-4.1.2.jar" >&5
-echo $ECHO_N "checking for libgcj-4.1.2.jar... $ECHO_C" >&6; }
+     if test x != x; then
+  LIBGCJ_OLD_TRUE=
+  LIBGCJ_OLD_FALSE='#'
+else
+  LIBGCJ_OLD_TRUE='#'
+  LIBGCJ_OLD_FALSE=
+fi
+
+    { echo "$as_me:$LINENO: checking for libgcj-4.3.0.jar or lib-4.1.2.jar" >&5
+echo $ECHO_N "checking for libgcj-4.3.0.jar or lib-4.1.2.jar... $ECHO_C" >&6; }
     if test -e "/usr/share/java/libgcj-4.3.0.jar"; then
       LIBGCJ_JAR=/usr/share/java/libgcj-4.3.0.jar
       { echo "$as_me:$LINENO: result: ${LIBGCJ_JAR}" >&5
@@ -6587,8 +6598,28 @@
 	{ echo "$as_me:$LINENO: result: ${LIBGCJ_JAR}" >&5
 echo "${ECHO_T}${LIBGCJ_JAR}" >&6; }
       else
-        { echo "$as_me:$LINENO: result: no" >&5
+	 if test x = x; then
+  LIBGCJ_OLD_TRUE=
+  LIBGCJ_OLD_FALSE='#'
+else
+  LIBGCJ_OLD_TRUE='#'
+  LIBGCJ_OLD_FALSE=
+fi
+
+        if test -e "/usr/share/java/libgcj-4.1.2.jar"; then
+          LIBGCJ_JAR=/usr/share/java/libgcj-4.1.2.jar
+          { echo "$as_me:$LINENO: result: ${LIBGCJ_JAR}" >&5
+echo "${ECHO_T}${LIBGCJ_JAR}" >&6; }
+	else
+	  if test -e "/usr/share/java/libgcj-4.1.jar"; then
+            LIBGCJ_JAR=/usr/share/java/libgcj-4.1.jar
+            { echo "$as_me:$LINENO: result: ${LIBGCJ_JAR}" >&5
+echo "${ECHO_T}${LIBGCJ_JAR}" >&6; }
+	  else
+	    { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
+	  fi
+	fi
       fi
     fi
   fi
@@ -6601,6 +6632,7 @@
 
 
 
+
 # Check whether --with-xalan2-jar was given.
 if test "${with_xalan2_jar+set}" = set; then
   withval=$with_xalan2_jar;
@@ -10125,6 +10157,20 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${LIBGCJ_OLD_TRUE}" && test -z "${LIBGCJ_OLD_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"LIBGCJ_OLD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"LIBGCJ_OLD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
+if test -z "${LIBGCJ_OLD_TRUE}" && test -z "${LIBGCJ_OLD_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"LIBGCJ_OLD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"LIBGCJ_OLD\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 if test -z "${USE_ALT_OPENJDK_SRC_ZIP_TRUE}" && test -z "${USE_ALT_OPENJDK_SRC_ZIP_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"USE_ALT_OPENJDK_SRC_ZIP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -10830,7 +10876,10 @@
 RMIC!$RMIC$ac_delim
 ECJ!$ECJ$ac_delim
 ECJ_JAR!$ECJ_JAR$ac_delim
+LIBGCJ_OLD_TRUE!$LIBGCJ_OLD_TRUE$ac_delim
+LIBGCJ_OLD_FALSE!$LIBGCJ_OLD_FALSE$ac_delim
 LIBGCJ_JAR!$LIBGCJ_JAR$ac_delim
+LIBGCJ_OLD!$LIBGCJ_OLD$ac_delim
 XALAN2_JAR!$XALAN2_JAR$ac_delim
 XALAN2_SERIALIZER_JAR!$XALAN2_SERIALIZER_JAR$ac_delim
 XERCES2_JAR!$XERCES2_JAR$ac_delim
@@ -10858,7 +10907,7 @@
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 41; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 44; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5