/hg/icedtea: 2 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Sep 30 03:50:40 PDT 2009
changeset e8514149a3c8 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=e8514149a3c8
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Sep 30 11:49:23 2009 +0100
Bump to b72 and new Zero update, don't copy OpenJDK source files
during build.
2009-09-30 Andrew John Hughes <ahughes at redhat.com>
* patches/icedtea-pregenerated-nimbus.patch: No
longer needed.
* ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp: Removed,
in upstream forest.
* Makefile.am: Bump to b72, remove JIBX Nimbus requirement and
don't copy OpenJDK source code.
* acinclude.m4: (FIND_BCEL_JAR): Removed.
(FIND_XPP3_JAR): Removed. (FIND_JIBX_DIR): Removed.
(AC_CHECK_ENABLE_NIMBUS): Removed.
(AC_CHECK_ENABLE_NIMBUS_GENERATION): Removed.
* configure.ac: Drop Nimbus/JIBX tests.
* patches/ecj/icedtea-hotspot-default.patch: Don't run
test_gamma on zero.
* patches/hotspot/default/icedtea-shark-build.patch,
* patches/hotspot/default/icedtea-shark.patch,
* patches/icedtea-libraries.patch,
* patches/icedtea-linker-libs-order.patch,
* patches/icedtea-shark-build.patch: Updated due to b72 and
Zero update.
changeset d0aceefec3f3 in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=d0aceefec3f3
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Sep 30 11:53:51 2009 +0100
Update NEWS.
2009-09-30 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Updated.
diffstat:
13 files changed, 261 insertions(+), 549 deletions(-)
ChangeLog | 29 ++++
Makefile.am | 141 ++++++--------------
NEWS | 7 +
acinclude.m4 | 142 ---------------------
configure.ac | 12 -
patches/ecj/icedtea-hotspot-default.patch | 17 +-
patches/hotspot/default/icedtea-shark-build.patch | 128 +++++++++---------
patches/hotspot/default/icedtea-shark.patch | 69 ++++------
patches/icedtea-libraries.patch | 128 ++++++++----------
patches/icedtea-linker-libs-order.patch | 14 +-
patches/icedtea-pregenerated-nimbus.patch | 26 ---
patches/icedtea-shark-build.patch | 20 +-
ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp | 77 -----------
diffs (truncated from 1515 to 500 lines):
diff -r 0b502a4ae3ff -r d0aceefec3f3 ChangeLog
--- a/ChangeLog Wed Sep 23 16:24:04 2009 -0400
+++ b/ChangeLog Wed Sep 30 11:53:51 2009 +0100
@@ -1,3 +1,32 @@ 2009-09-23 Jon VanAlten <jon.vanalten@
+2009-09-30 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS:
+ Updated.
+
+2009-09-30 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/icedtea-pregenerated-nimbus.patch:
+ No longer needed.
+ * ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp:
+ Removed, in upstream forest.
+ * Makefile.am: Bump to b72, remove JIBX Nimbus requirement
+ and don't copy OpenJDK source code.
+ * acinclude.m4:
+ (FIND_BCEL_JAR): Removed.
+ (FIND_XPP3_JAR): Removed.
+ (FIND_JIBX_DIR): Removed.
+ (AC_CHECK_ENABLE_NIMBUS): Removed.
+ (AC_CHECK_ENABLE_NIMBUS_GENERATION): Removed.
+ * configure.ac: Drop Nimbus/JIBX tests.
+ * patches/ecj/icedtea-hotspot-default.patch:
+ Don't run test_gamma on zero.
+ * patches/hotspot/default/icedtea-shark-build.patch,
+ * patches/hotspot/default/icedtea-shark.patch,
+ * patches/icedtea-libraries.patch,
+ * patches/icedtea-linker-libs-order.patch,
+ * patches/icedtea-shark-build.patch:
+ Updated due to b72 and Zero update.
+
2009-09-23 Jon VanAlten <jon.vanalten at redhat.com>
* Makefile.am:
diff -r 0b502a4ae3ff -r d0aceefec3f3 Makefile.am
--- a/Makefile.am Wed Sep 23 16:24:04 2009 -0400
+++ b/Makefile.am Wed Sep 30 11:53:51 2009 +0100
@@ -1,20 +1,20 @@ OPENJDK_VERSION = b71
-OPENJDK_VERSION = b71
-
-OPENJDK_CHANGESET = 47425552fc70
-CORBA_CHANGESET = 109171aadcfa
-JAXP_CHANGESET = 6d4f2360ffe6
-JAXWS_CHANGESET = 75cfe6f615df
-JDK_CHANGESET = 2a1a7fb44226
-LANGTOOLS_CHANGESET = 70cd643d6217
-HOTSPOT_CHANGESET = 73abf11e8e61
-
-OPENJDK_MD5SUM = d0753b769317c497ae14d9ab089504f7
-CORBA_MD5SUM = 5cb4f5afbef00fd662c554b9dd7312a7
-JAXP_MD5SUM = 0203983e81a05e548f7fc7bed557bf2c
-JAXWS_MD5SUM = 07015564ab925a96cebf363814707d64
-JDK_MD5SUM = 9297009647ee6d3711fb59c3d3914404
-LANGTOOLS_MD5SUM = 70c0690c8ee523beb2a19dd1b7d2a9f9
-HOTSPOT_MD5SUM = 27eabf6067ac04edf002fad94671bbe1
+OPENJDK_VERSION = b72
+
+CORBA_CHANGESET = 5fdcfb25dbb4
+HOTSPOT_CHANGESET = c8155bc21432
+JAXP_CHANGESET = fe2e7f835dd2
+JAXWS_CHANGESET = 501b8988da30
+JDK_CHANGESET = c2cd86f82ed7
+LANGTOOLS_CHANGESET = 5a36337cc053
+OPENJDK_CHANGESET = 717f2b969919
+
+CORBA_MD5SUM = 5a9fef662129c05b2dd05c79a2685178
+HOTSPOT_MD5SUM = e5b21a7e5cc5cae315cd9aa158ee9858
+JAXP_MD5SUM = f4bd08cf016fefe31c4269b9d90edec0
+JAXWS_MD5SUM = 8d0729f5c4ddec47393e636e7d6a4914
+JDK_MD5SUM = 622268153bc097a5b91d76305eb0502d
+LANGTOOLS_MD5SUM = eadbaead19df2fbe039fd12593e97197
+OPENJDK_MD5SUM = b5d1f6fad70a2b6af7b011169fbd6da3
CACAO_VERSION = 0.99.4
CACAO_MD5SUM = 63220327925ace13756ae334c55a3baa
@@ -61,19 +61,15 @@ PULSE_JAVA_CLASS_DIR =
PULSE_JAVA_CLASS_DIR =
endif
-if ENABLE_NIMBUS_GENERATION
-JIBX_DEPS_DIR=$(abs_top_builddir)/jibx
-endif
-
-SHARE = openjdk/jdk/src/share/classes
-SOLARIS = openjdk/jdk/src/solaris/classes
+JDK_SHARE = openjdk/jdk/src/share/classes
+JDK_SOLARIS = openjdk/jdk/src/solaris/classes
LANGTOOLS = openjdk/langtools/src/share/classes
JAXP = openjdk/jaxp/src/share/classes
CORBA = openjdk/corba/src/share/classes
JAXWS = openjdk/jaxws/src/share/classes
OPENJDK_SOURCEPATH_DIRS = \
- $(SHARE):$(SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS)
+ $(JDK_SHARE):$(JDK_SOLARIS):$(LANGTOOLS):$(JAXP):$(CORBA):$(JAXWS)
SOURCEPATH_DIRS = $(abs_top_builddir)/generated:$(OPENJDK_SOURCEPATH_DIRS)
@@ -1555,11 +1551,9 @@ ICEDTEA_ENV = \
ENDORSED="-Djava.endorsed.dirs=$(ICEDTEA_ENDORSED_DIR)" \
CLASSPATH="" \
LD_LIBRARY_PATH="" \
- CORE_BUILD="$(ICEDTEA_CORE_BUILD)" \
ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
ICEDTEA_SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
ZERO_LIBARCH="$(ZERO_LIBARCH)" \
- ZERO_BITSPERWORD="$(ZERO_BITSPERWORD)" \
ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \
ZERO_ARCHDEF="$(ZERO_ARCHDEF)" \
ZERO_ARCHFLAG="$(ZERO_ARCHFLAG)" \
@@ -1579,7 +1573,6 @@ ICEDTEA_ENV = \
ANT_RESPECT_JAVA_HOME="TRUE" \
RHINO_JAR="$(RHINO_JAR)" \
DISTRIBUTION_ID="$(DIST_ID)" \
- ALT_JIBX_LIBS_PATH="$(JIBX_DEPS_DIR)" \
ALT_NETX_DIST="$(abs_top_builddir)/netx.build" \
ALT_LIVECONNECT_DIST="$(abs_top_builddir)" \
DEBUG_CLASSFILES="true" \
@@ -1589,11 +1582,6 @@ if WITH_CACAO
if WITH_CACAO
ICEDTEA_ENV += \
ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
-endif
-
-if !ENABLE_NIMBUS_GENERATION
-ICEDTEA_ENV += \
- DISABLE_NIMBUS="true"
endif
if DISABLE_OPTIMIZATIONS
@@ -1643,11 +1631,9 @@ ICEDTEA_ENV_ECJ = \
CLASSPATH="" \
LD_LIBRARY_PATH="" \
GENSRCDIR="$(abs_top_builddir)/generated" \
- CORE_BUILD="$(ICEDTEA_CORE_BUILD)" \
ZERO_BUILD="$(ICEDTEA_ZERO_BUILD)" \
ICEDTEA_SHARK_BUILD="$(ICEDTEA_SHARK_BUILD)" \
ZERO_LIBARCH="$(ZERO_LIBARCH)" \
- ZERO_BITSPERWORD="$(ZERO_BITSPERWORD)" \
ZERO_ENDIANNESS="$(ZERO_ENDIANNESS)" \
ZERO_ARCHDEF="$(ZERO_ARCHDEF)" \
ZERO_ARCHFLAG="$(ZERO_ARCHFLAG)" \
@@ -2126,12 +2112,6 @@ endif
if ENABLE_SYSTEMTAP
ICEDTEA_PATCHES += patches/icedtea-systemtap.patch
-endif
-
-if ENABLE_NIMBUS
-if !ENABLE_NIMBUS_GENERATION
-ICEDTEA_PATCHES += patches/icedtea-pregenerated-nimbus.patch
-endif
endif
if ENABLE_PLUGIN
@@ -2471,7 +2451,7 @@ ICEDTEA_ECJ_PATCHES = patches/ecj/icedte
ICEDTEA_ECJ_PATCHES = patches/ecj/icedtea.patch \
patches/ecj/icedtea-hotspot-$(HSBUILD).patch \
patches/ecj/icedtea-jopt.patch \
- patches/ecj/icedtea-dyn.patch
+ patches/ecj/icedtea-dyn.patch
if CP39408_JAVAH
ICEDTEA_ECJ_PATCHES += patches/ecj/icedtea-pr39408.patch
@@ -2689,8 +2669,8 @@ stamps/icedtea.stamp: stamps/bootstrap-d
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) $(JNLP_ABOUT_TARGET) \
- stamps/jibx.stamp stamps/cacao.stamp stamps/netx-dist.stamp \
- stamps/liveconnect.stamp stamps/pulse-java.stamp stamps/visualvm.stamp
+ stamps/cacao.stamp stamps/netx-dist.stamp stamps/liveconnect.stamp \
+ stamps/pulse-java.stamp stamps/visualvm.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/ \
@@ -2779,8 +2759,8 @@ stamps/icedtea-debug.stamp: stamps/boots
stamps/hotspot-tools.stamp stamps/plugs.stamp \
stamps/ports.stamp stamps/patch.stamp stamps/overlay.stamp \
$(ICEDTEAPLUGIN_TARGET) $(ICEDTEANPPLUGIN_TARGET) $(JNLP_ABOUT_TARGET) \
- stamps/jibx.stamp stamps/cacao.stamp stamps/netx-dist.stamp \
- stamps/liveconnect.stamp stamps/pulse-java.stamp stamps/visualvm.stamp
+ stamps/cacao.stamp stamps/netx-dist.stamp stamps/liveconnect.stamp \
+ stamps/pulse-java.stamp stamps/visualvm.stamp
$(ARCH_PREFIX) $(MAKE) \
$(ICEDTEA_ENV) \
-C openjdk/ \
@@ -2957,38 +2937,18 @@ clean-tools-jar: clean-hotspot-tools
rm -f stamps/hotspot-tools.stamp
rm -f bootstrap/jdk1.7.0/lib/tools.jar
-# Sources copied from OpenJDK.
-ICEDTEA_COPY_DIRS = \
- com/sun/jdi \
- com/sun/jdi/connect \
- com/sun/jdi/connect/spi \
- com/sun/jdi/event \
- com/sun/jdi/request \
- com/sun/tools/jdi \
- com/sun/net/httpserver \
- java/io \
- java/util \
- java/rmi \
- sun/awt/ \
- javax/net/ssl \
- javax/script
-
-stamps/copy-source-files.stamp: stamps/overlay.stamp
- for copy_dir in $(ICEDTEA_COPY_DIRS) ; \
- do \
- mkdir -p rt/$$copy_dir ; \
- cp -pPRf openjdk/jdk/src/share/classes/$$copy_dir/*.java \
- rt/$$copy_dir ; \
- done
- mkdir -p stamps
- touch stamps/copy-source-files.stamp
-
-clean-copy:
- rm -f stamps/copy-source-files.stamp
- for copy_dir in $(ICEDTEA_COPY_DIRS) ; \
- do \
- rm -rf rt/$$copy_dir ; \
- done
+# Sources used from OpenJDK.
+ICEDTEA_BOOTSTRAP_DIRS = \
+ $(JDK_SHARE)/com/sun/jdi \
+ $(JDK_SHARE)/com/sun/tools/jdi \
+ $(JDK_SHARE)/com/sun/net/httpserver \
+ $(JDK_SHARE)/java/io \
+ $(JDK_SHARE)/java/util \
+ $(JDK_SHARE)/java/rmi \
+ $(JDK_SHARE)/sun/awt/ \
+ $(JDK_SHARE)/javax/net/ssl \
+ $(JDK_SHARE)/javax/script \
+ $(JAXWS)/javax/xml/bind
# tools.jar class files.
stamps/hotspot-tools-copy-source-files.stamp: stamps/overlay.stamp
@@ -3059,9 +3019,13 @@ bootstrap/jdk1.7.0/lib/tools.jar: stamps
fi
# rt-closed.jar class files.
-rt-source-files.txt: stamps/extract.stamp stamps/copy-source-files.stamp
+rt-source-files.txt: stamps/extract.stamp stamps/overlay.stamp
find $(abs_top_builddir)/rt -name '*.java' \
| sort -u > $@
+ for dir in $(ICEDTEA_BOOTSTRAP_DIRS) ; \
+ do \
+ find $(abs_top_builddir)/$$dir -name '*.java' >> $@; \
+ done
stamps/rt-class-files.stamp: rt-source-files.txt stamps/hotspot-tools.stamp
mkdir -p lib/rt
@@ -3156,23 +3120,6 @@ stamps/liveconnect.stamp: stamps/hotspot
fi
mkdir -p stamps
touch stamps/liveconnect.stamp
-
-stamps/jibx.stamp:
-if ENABLE_NIMBUS
-if ENABLE_NIMBUS_GENERATION
- mkdir $(JIBX_DEPS_DIR)
- ln -s $(BCEL_JAR) $(JIBX_DEPS_DIR)
- ln -s $(XPP3_JAR) $(JIBX_DEPS_DIR)
- ln -s $(JIBX_DIR)/jibx-bind.jar $(JIBX_DEPS_DIR)
- ln -s $(JIBX_DIR)/jibx-run.jar $(JIBX_DEPS_DIR)
-else
- mkdir -p $(BUILD_OUTPUT_DIR)/gensrc/javax/swing/plaf
- cp -a $(abs_top_builddir)/generated/javax/swing/plaf/nimbus \
- $(BUILD_OUTPUT_DIR)/gensrc/javax/swing/plaf
-endif
-endif
- mkdir -p stamps
- touch $@
stamps/cacao.stamp: stamps/extract.stamp stamps/rt-class-files.stamp
if BUILD_CACAO
@@ -3646,8 +3593,6 @@ visualvm: stamps/visualvm.stamp
nbplatform: stamps/nbplatform.stamp
-copy-source-files: stamps/copy-source-files.stamp
-
download: stamps/download.stamp
extract: stamps/extract.stamp
@@ -3664,8 +3609,6 @@ icedtea-debug: stamps/icedtea-debug.stam
icedtea-ecj: stamps/icedtea-ecj.stamp
-jibx: stamps/jibx.stamp
-
native-ecj: stamps/native-ecj.stamp
patch-ecj: stamps/patch-ecj.stamp
diff -r 0b502a4ae3ff -r d0aceefec3f3 NEWS
--- a/NEWS Wed Sep 23 16:24:04 2009 -0400
+++ b/NEWS Wed Sep 30 11:53:51 2009 +0100
@@ -1,3 +1,10 @@ New in release 1.11 (2009-08-06)
+New in release 1.12 (2009-XX-XX)
+
+- Updated Zero with Gary's latest revisions
+- JIBX is no longer required to build Nimbus.
+- The NSS crypto. provider may be turned on with --enable-nss if
+ the NSS libraries and headers are available via pkg-config.
+
New in release 1.11 (2009-08-06)
- Updated to OpenJDK7 b66 (Milestone 4), including
diff -r 0b502a4ae3ff -r d0aceefec3f3 acinclude.m4
--- a/acinclude.m4 Wed Sep 23 16:24:04 2009 -0400
+++ b/acinclude.m4 Wed Sep 30 11:53:51 2009 +0100
@@ -1239,131 +1239,6 @@ AC_PROVIDE([$0])dnl
AC_PROVIDE([$0])dnl
])
-AC_DEFUN([FIND_BCEL_JAR],
-[
- AC_MSG_CHECKING([for bytecode engineering library (BCEL)])
- AC_ARG_WITH([bcel],
- [AS_HELP_STRING(--with-bcel,specify location of the bcel jar)],
- [
- case "${withval}" in
- yes)
- BCEL_JAR=yes
- ;;
- no)
- BCEL_JAR=no
- ;;
- *)
- BCEL_JAR="${withval}"
- ;;
- esac
- ],
- [
- BCEL_JAR=yes
- ])
- if test x"${BCEL_JAR}" = "xyes"; then
- if test -e "/usr/share/bcel/lib/bcel.jar"; then
- BCEL_JAR="/usr/share/bcel/lib/bcel.jar"
- elif test -e "/usr/share/java/bcel.jar"; then
- BCEL_JAR="/usr/share/java/bcel.jar"
- fi
- fi
- if ! test -f "${BCEL_JAR}"; then
- AC_MSG_RESULT([not found])
- AC_MSG_ERROR("A BCEL jar ${BCEL_JAR} was not found.")
- fi
- AC_MSG_RESULT(${BCEL_JAR})
- AC_SUBST(BCEL_JAR)
-])
-
-AC_DEFUN([FIND_XPP3_JAR],
-[
- AC_MSG_CHECKING([for XML Pull Parser 3 (XPP3)])
- AC_ARG_WITH([xpp3],
- [AS_HELP_STRING(--with-xpp3,specify location of the xpp3 jar)],
- [
- case "${withval}" in
- yes)
- XPP3_JAR=yes
- ;;
- no)
- XPP3_JAR=no
- ;;
- *)
- XPP3_JAR="${withval}"
- ;;
- esac
- ],
- [
- XPP3_JAR=yes
- ])
- if test x"${XPP3_JAR}" = "xyes"; then
- if test -e "/usr/share/xpp3/lib/xpp3.jar"; then
- XPP3_JAR="/usr/share/xpp3/lib/xpp3.jar"
- elif test -e "/usr/share/java/xpp3.jar"; then
- XPP3_JAR="/usr/share/java/xpp3.jar"
- fi
- fi
- if ! test -f "${XPP3_JAR}"; then
- AC_MSG_RESULT([not found])
- AC_MSG_ERROR("A XPP3 jar ${XPP3_JAR} was not found.")
- fi
- AC_MSG_RESULT(${XPP3_JAR})
- AC_SUBST(XPP3_JAR)
-])
-
-AC_DEFUN([FIND_JIBX_DIR],
-[
- AC_MSG_CHECKING([for JIBX])
- AC_ARG_WITH([jibx],
- [AS_HELP_STRING(--with-jibx,specify location of the jibx jars)],
- [
- case "${withval}" in
- yes)
- JIBX_DIR=yes
- ;;
- no)
- JIBX_DIR=no
- ;;
- *)
- JIBX_DIR="${withval}"
- ;;
- esac
- ],
- [
- JIBX_DIR=yes
- ])
- if test x"${JIBX_DIR}" = "xyes"; then
- if test -e "/usr/share/jibx/lib/jibx-run.jar"; then
- JIBX_DIR=/usr/share/jibx/lib
- elif test -e "/usr/share/java/jibx-run.jar"; then
- JIBX_DIR=/usr/share/java
- fi
- fi
- if ! test -d "${JIBX_DIR}"; then
- AC_MSG_RESULT([not found])
- AC_MSG_ERROR("A JIBX jar directory ${JIBX_JAR} was not found.")
- fi
- AC_MSG_RESULT(${JIBX_DIR})
- AC_SUBST(JIBX_DIR)
-])
-
-AC_DEFUN([AC_CHECK_ENABLE_NIMBUS],
-[
- AC_MSG_CHECKING(whether to build the Nimbus L'n'F)
- AC_ARG_ENABLE([nimbus],
- [AS_HELP_STRING(--enable-nimbus,build the Nimbus L'n'F [[default=yes]])],
- [
- ENABLE_NIMBUS="${enableval}"
- ],
- [
- ENABLE_NIMBUS=yes
- ])
-
- AC_MSG_RESULT(${ENABLE_NIMBUS})
- AM_CONDITIONAL(ENABLE_NIMBUS, test x"${ENABLE_NIMBUS}" = "xyes")
- AC_SUBST(ENABLE_NIMBUS)
-])
-
AC_DEFUN([IT_XULRUNNER_VERSION],
[
AC_LANG_PUSH([C++])
@@ -1413,23 +1288,6 @@ AC_LANG_POP([C++])
AC_LANG_POP([C++])
AC_SUBST(MOZILLA_VERSION_COLLAPSED, $xulrunner_cv_collapsed_version)
-])
-
-AC_DEFUN([AC_CHECK_ENABLE_NIMBUS_GENERATION],
-[
- AC_MSG_CHECKING(whether to generate the Nimbus source files using JIBX)
- AC_ARG_ENABLE([nimbus-generation],
- [AS_HELP_STRING(--enable-nimbus-generation,generate the Nimbus source with JIBX [[default=no]])],
- [
- ENABLE_NIMBUS_GENERATION="${enableval}"
- ],
- [
- ENABLE_NIMBUS_GENERATION=no
- ])
-
- AC_MSG_RESULT(${ENABLE_NIMBUS_GENERATION})
- AM_CONDITIONAL(ENABLE_NIMBUS_GENERATION, test x"${ENABLE_NIMBUS_GENERATION}" = "xyes")
- AC_SUBST(ENABLE_NIMBUS_GENERATION)
])
AC_DEFUN([IT_CHECK_ADDITIONAL_VMS],
diff -r 0b502a4ae3ff -r d0aceefec3f3 configure.ac
--- a/configure.ac Wed Sep 23 16:24:04 2009 -0400
+++ b/configure.ac Wed Sep 30 11:53:51 2009 +0100
@@ -229,8 +229,6 @@ AC_CHECK_ENABLE_CACAO
AC_CHECK_ENABLE_CACAO
AC_CHECK_WITH_CACAO_HOME
AC_CHECK_WITH_CACAO_SRC_ZIP
-AC_CHECK_ENABLE_NIMBUS
-AC_CHECK_ENABLE_NIMBUS_GENERATION
DISABLE_OPTIMIZATIONS
SET_SHARK_BUILD
ENABLE_ZERO_BUILD
@@ -259,16 +257,6 @@ if test "x${enable_visualvm}" = "xyes"
if test "x${enable_visualvm}" = "xyes"
then
FIND_NETBEANS
-fi
-
-if test "x${ENABLE_NIMBUS}" = "xyes"
-then
- if test "x${ENABLE_NIMBUS_GENERATION}" = "xyes"
- then
- FIND_BCEL_JAR
- FIND_XPP3_JAR
- FIND_JIBX_DIR
- fi
fi
dnl pkgconfig cannot be used to find these headers and libraries.
diff -r 0b502a4ae3ff -r d0aceefec3f3 patches/ecj/icedtea-hotspot-default.patch
--- a/patches/ecj/icedtea-hotspot-default.patch Wed Sep 23 16:24:04 2009 -0400
More information about the distro-pkg-dev
mailing list