changeset in /hg/icedtea6: 2009-05-03 Matthias Klose <doko at ubu...

[doko at ubuntu.com]

changeset 2b90f322b87e in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2b90f322b87e
description:
	2009-05-03  Matthias Klose  <doko at ubuntu.com>

	        * Makefile.am (ICEDTEA_PATCHES): Apply icedtea-cacao conditionally
	        on BUILD_CACAO.
	        (ADD_ZERO_EXTRA_BUILD_ENV): Filter out cacao patches passed in
	        DISTRIBUTION_PATCHES.
	        (stamps/add-zero.stamp, stamps/add-zero-debug.stamp): Remove obsolete
	        unset commands.

diffstat:

2 files changed, 13 insertions(+), 5 deletions(-)
ChangeLog   |    9 +++++++++
Makefile.am |    9 ++++-----

diffs (64 lines):

diff -r 8a48ae5515d7 -r 2b90f322b87e ChangeLog
--- a/ChangeLog	Fri May 01 14:14:15 2009 -0400
+++ b/ChangeLog	Sun May 03 16:28:29 2009 +0200
@@ -1,3 +1,12 @@ 2009-05-01  Lillian Angel  <langel at redha
+2009-05-03  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am (ICEDTEA_PATCHES): Apply icedtea-cacao conditionally
+	on BUILD_CACAO.
+	(ADD_ZERO_EXTRA_BUILD_ENV): Filter out cacao patches passed in
+	DISTRIBUTION_PATCHES.
+	(stamps/add-zero.stamp, stamps/add-zero-debug.stamp): Remove obsolete
+	unset commands.
+	
 2009-05-01  Lillian Angel  <langel at redhat.com>
 
 	* Makefile.am
diff -r 8a48ae5515d7 -r 2b90f322b87e Makefile.am
--- a/Makefile.am	Fri May 01 14:14:15 2009 -0400
+++ b/Makefile.am	Sun May 03 16:28:29 2009 +0200
@@ -639,8 +639,10 @@ ICEDTEA_PATCHES += \
 	patches/icedtea-rhino.patch
 endif
 
+if BUILD_CACAO
 ICEDTEA_PATCHES += \
 	patches/icedtea-cacao.patch
+endif
 if WITH_CACAO
 ICEDTEA_PATCHES += \
 	patches/icedtea-cacao-ignore-jdi-tests.patch \
@@ -1802,18 +1804,17 @@ ADD_ZERO_EXTRA_BUILD_ENV = \
 	BUILD_JAXP=false      ALT_JAXP_DIST=$(ICEDTEA_BUILD_DIR)/jaxp/dist \
 	BUILD_JAXWS=false     ALT_JAXWS_DIST=$(ICEDTEA_BUILD_DIR)/jaxws/dist \
 	BUILD_CORBA=false     ALT_CORBA_DIST=$(ICEDTEA_BUILD_DIR)/corba/dist \
-	BUILD_JDK=false
+	BUILD_JDK=false \
+	DISTRIBUTION_PATCHES='$(foreach p,$(DISTRIBUTION_PATCHES),$(if $(findstring cacao,$(p)),,$(p)))'
 
 stamps/add-zero.stamp: stamps/icedtea.stamp
 if ADD_ZERO_BUILD
 	mkdir -p zerovm
 
-	for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \
 	cd zerovm && \
 	    $(ADD_ZERO_EXTRA_BUILD_ENV) \
 		$(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS)
 
-	for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \
 	$(ADD_ZERO_EXTRA_BUILD_ENV) \
 		$(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_BUILD_TARGET)
 
@@ -1830,12 +1831,10 @@ if ADD_ZERO_BUILD
 if ADD_ZERO_BUILD
 	mkdir -p zerovm
 
-	for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \
 	cd zerovm && \
 	    $(ADD_ZERO_EXTRA_BUILD_ENV) \
 		$(ARCH_PREFIX) $(abs_top_srcdir)/configure $(ADD_ZERO_CONFIGURE_ARGS)
 
-	for v in $(ICEDTEA_ENV); do case $$v in PATH=*) ;; *) unset $${v%%=*}; esac; done; \
 	$(ADD_ZERO_EXTRA_BUILD_ENV) \
 		$(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_DEBUG_BUILD_TARGET)