Mercurial > hg > release > icedtea-1.10
changeset 1798:7409d7ed0c8b
Forwardport --with-additional-vms support.
2009-05-03 Matthias Klose <doko@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.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Wed, 20 May 2009 20:26:00 +0100 |
| parents | f06356634030 |
| children | a0a5d904139d |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 16 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed May 20 20:23:37 2009 +0100 +++ b/ChangeLog Wed May 20 20:26:00 2009 +0100 @@ -1,3 +1,12 @@ +2009-05-03 Matthias Klose <doko@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 Matthias Klose <doko@ubuntu.com> * patches/cacao/launcher.patch: Create new thread depending on the
--- a/Makefile.am Wed May 20 20:23:37 2009 +0100 +++ b/Makefile.am Wed May 20 20:26:00 2009 +0100 @@ -1974,7 +1974,6 @@ patches/icedtea-jvmtiEnv.patch \ patches/icedtea-xml-encodinginfo.patch \ patches/icedtea-cc-interp-backedge.patch \ - patches/cacao/launcher.patch \ $(DISTRIBUTION_PATCHES) if WITH_RHINO @@ -1982,6 +1981,11 @@ patches/icedtea-rhino.patch endif +if BUILD_CACAO +ICEDTEA_PATCHES += \ + patches/cacao/launcher.patch +endif + if WITH_CACAO ICEDTEA_PATCHES += \ patches/cacao/ignore-tests.patch @@ -3235,18 +3239,17 @@ 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) @@ -3263,12 +3266,10 @@ 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)