/hg/icedtea: PR 704, fix build --with-additional-vms=zero

[doko at icedtea.classpath.org]

changeset 1684b3450ecf in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=1684b3450ecf
author: doko at ubuntu.com
date: Sat May 28 12:31:06 2011 +0200

	PR 704, fix build --with-additional-vms=zero

	The add-zero targets were not updated when the rest of the build
	infrastructure was updated. Fix the target to build hotspot, and do
	not use the javac from the stage1 default build.

	2011-05-28 Matthias Klose <doko at ubuntu.com>

	 PR 704
	        * Makefile.am (ADD_ZERO_EXTRA_BUILD_ENV): Filter-out distribution
	specific jamvm patches. (ADD_ZERO_CONFIGURE_ARGS): Filter-
	out --with-javac. (stamps/add-zero.stamp, stamps/add-zero-
	debug.stamp): Update build target.


diffstat:

 ChangeLog   |  8 ++++++++
 Makefile.am |  7 ++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diffs (53 lines):

diff -r ccbd95318206 -r 1684b3450ecf ChangeLog
--- a/ChangeLog	Fri May 27 17:19:22 2011 +0200
+++ b/ChangeLog	Sat May 28 12:31:06 2011 +0200
@@ -1,3 +1,11 @@
+2011-05-28  Matthias Klose  <doko at ubuntu.com>
+
+	PR 704
+	* Makefile.am (ADD_ZERO_EXTRA_BUILD_ENV): Filter-out distribution
+	specific jamvm patches.
+	(ADD_ZERO_CONFIGURE_ARGS): Filter-out --with-javac.
+	(stamps/add-zero.stamp, stamps/add-zero-debug.stamp): Update build target.
+
 2011-05-27  Xerxes RÃ¥nby  <xranby at zafena.se>
 
 	* NEWS: Fix previous commits news entry.
diff -r ccbd95318206 -r 1684b3450ecf Makefile.am
--- a/Makefile.am	Fri May 27 17:19:22 2011 +0200
+++ b/Makefile.am	Sat May 28 12:31:06 2011 +0200
@@ -2222,6 +2222,7 @@
 	--disable-docs \
 	$(filter-out '--with-jdk-home=% '--with-ecj=% \
 			'--with-java=% '--with-javah=% \
+			'--with-javac=% '--with-javac=% \
 			'--with-rmic=% '--with-additional-vms=% \
 			'--disable-bootstrap% '--enable-bootstrap% , \
 		$(CONFIGURE_ARGS)) \
@@ -2234,7 +2235,7 @@
 	BUILD_JAXWS=false     ALT_JAXWS_DIST=$(BUILD_OUTPUT_DIR)/jaxws/dist \
 	BUILD_CORBA=false     ALT_CORBA_DIST=$(BUILD_OUTPUT_DIR)/corba/dist \
 	BUILD_JDK=false \
-	DISTRIBUTION_PATCHES='$(foreach p,$(DISTRIBUTION_PATCHES),$(if $(findstring cacao,$(p)),,$(p)))'
+	DISTRIBUTION_PATCHES='$(foreach p,$(DISTRIBUTION_PATCHES),$(if $(findstring cacao,$(p)),,$(if $(findstring jamvm,$(p)),,$(p))))'
 
 stamps/add-zero.stamp: stamps/icedtea.stamp
 	mkdir -p stamps
@@ -2246,7 +2247,7 @@
 		$(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS)
 
 	$(ADD_ZERO_EXTRA_BUILD_ENV) \
-		$(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_BUILD_TARGET)
+		$(ARCH_PREFIX) $(MAKE) -C zerovm ICEDTEA_BUILD_TARGET=hotspot icedtea-stage2
 
 if ZERO_BUILD
 	mkdir -p $(BUILD_JRE_ARCH_DIR)/shark
@@ -2287,7 +2288,7 @@
 		$(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS)
 
 	$(ADD_ZERO_EXTRA_BUILD_ENV) \
-		$(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_DEBUG_BUILD_TARGET)
+		$(ARCH_PREFIX) $(MAKE) -C zerovm ICEDTEA_DEBUG_BUILD_TARGET=hotspot icedtea-stage2
 
 if ZERO_BUILD
 	mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/shark