changeset in /hg/icedtea: 2008-02-05 Lillian Angel <langel at red...
Lillian Angel
langel at redhat.com
Thu May 29 14:11:34 PDT 2008
changeset 9634d237cd1b in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=9634d237cd1b
description:
2008-02-05 Lillian Angel <langel at 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.
diffstat:
5 files changed, 87 insertions(+), 8 deletions(-)
ChangeLog | 9 +++++++++
Makefile.am | 9 ++++++++-
Makefile.in | 1 +
acinclude.m4 | 19 ++++++++++++++++---
configure | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
diffs (215 lines):
diff -r e007430c8272 -r 9634d237cd1b ChangeLog
--- 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 Bernhard Rosenkränzer <ber
+2008-02-05 Lillian Angel <langel at 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 at arklinux.org>
* configure.ac: Added check for jar. If fastjar is not found, then jar
diff -r e007430c8272 -r 9634d237cd1b Makefile.am
--- a/Makefile.am Tue Feb 05 09:53:53 2008 -0500
+++ b/Makefile.am Tue Feb 05 11:20:56 2008 -0500
@@ -188,6 +188,13 @@ if FAST_BUILD
FAST_BUILD_PATCH = patches/icedtea-speed.patch
else
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 = \
@@ -230,7 +237,7 @@ ICEDTEA_PATCHES = \
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)
diff -r e007430c8272 -r 9634d237cd1b Makefile.in
--- a/Makefile.in Tue Feb 05 09:53:53 2008 -0500
+++ b/Makefile.in Tue Feb 05 11:20:56 2008 -0500
@@ -117,6 +117,7 @@ JAVAH = @JAVAH@
JAVAH = @JAVAH@
LDFLAGS = @LDFLAGS@
LIBGCJ_JAR = @LIBGCJ_JAR@
+LIBGCJ_OLD = @LIBGCJ_OLD@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
diff -r e007430c8272 -r 9634d237cd1b acinclude.m4
--- 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_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 @@ AC_DEFUN([FIND_LIBGCJ_JAR],
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 @@ AC_DEFUN([FIND_LIBGCJ_JAR],
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_DEFUN([FIND_LIBGCJ_JAR],
AC_MSG_ERROR("A LIBGCJ jar was not found.")
fi
AC_SUBST(LIBGCJ_JAR)
+ AC_SUBST(LIBGCJ_OLD)
])
AC_DEFUN([FIND_JAVAH],
diff -r e007430c8272 -r 9634d237cd1b configure
--- 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
RMIC
ECJ
ECJ_JAR
+LIBGCJ_OLD_TRUE
+LIBGCJ_OLD_FALSE
LIBGCJ_JAR
+LIBGCJ_OLD
XALAN2_JAR
XALAN2_SERIALIZER_JAR
XERCES2_JAR
@@ -1377,7 +1380,7 @@ Optional Packages:
--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
@@ -6579,8 +6582,16 @@ fi
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
@@ -6591,8 +6602,28 @@ echo "${ECHO_T}${LIBGCJ_JAR}" >&6; }
{ 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 @@ echo "$as_me: error: \"A LIBGCJ jar was
echo "$as_me: error: \"A LIBGCJ jar was not found.\"" >&2;}
{ (exit 1); exit 1; }; }
fi
+
@@ -10164,6 +10196,20 @@ if test -z "${WITH_ICEDTEA_TRUE}" && tes
{ { echo "$as_me:$LINENO: error: conditional \"WITH_ICEDTEA\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"WITH_ICEDTEA\" 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 "${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
@@ -10879,7 +10925,10 @@ RMIC!$RMIC$ac_delim
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
More information about the distro-pkg-dev
mailing list