Mercurial > hg > release > icedtea7-2.2
changeset 2274:1d83df258409
PR icedtea/512: Extract jaxws getdtdtype patch to boot tree instead of main tree.
2010-06-25 Andrew John Hughes <ahughes@redhat.com>
PR icedtea/512:
(extract-jaxws): Depend on $(OPENJDK_BOOT_TREE)
and patch that tree instead.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Fri, 25 Jun 2010 10:29:19 +0100 |
| parents | 6870b368f4e5 |
| children | 74cfd211da47 |
| files | ChangeLog Makefile.am |
| diffstat | 2 files changed, 11 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jun 25 02:15:15 2010 +0100 +++ b/ChangeLog Fri Jun 25 10:29:19 2010 +0100 @@ -1,3 +1,9 @@ +2010-06-25 Andrew John Hughes <ahughes@redhat.com> + + PR icedtea/512: + (extract-jaxws): Depend on $(OPENJDK_BOOT_TREE) + and patch that tree instead. + 2010-06-24 Andrew John Hughes <ahughes@redhat.com> * patches/cacao/package-version.patch:
--- a/Makefile.am Fri Jun 25 02:15:15 2010 +0100 +++ b/Makefile.am Fri Jun 25 10:29:19 2010 +0100 @@ -1259,19 +1259,19 @@ clean-extract-cacao: clean-cacao rm -f stamps/extract-cacao.stamp -stamps/extract-jaxws.stamp: stamps/extract-openjdk.stamp \ +stamps/extract-jaxws.stamp: $(OPENJDK_BOOT_TREE) \ stamps/download-jaxws-drop.stamp stamps/download-jaf-drop.stamp set -e ; \ if test "x$(NEED_JAXWS_SRC)" = "xtrue"; then \ - (cd openjdk/jaxws ; \ + (cd openjdk-boot/jaxws ; \ $(ANT) -Ddrops.dir=$(abs_top_builddir)/drops \ - -Doutput.dir=$(BUILD_OUTPUT_DIR)/jaxws \ + -Doutput.dir=$(BOOT_BUILD_OUTPUT_DIR)/jaxws \ source ; \ cd $(abs_top_builddir)) ; \ fi if DTDTYPE_QNAME set -e ; \ - (cd $(BUILD_OUTPUT_DIR)/jaxws; \ + (cd $(BOOT_BUILD_OUTPUT_DIR)/jaxws; \ all_patches_ok=yes; \ for p in $(JAXWS_PATCHES) ; \ do \ @@ -1296,8 +1296,7 @@ echo ERROR patch $${all_patches_ok} FAILED! ; \ echo WARNING make clean-extract-jaxws before retrying a fix ; \ exit 2; \ - fi ; \ - cd $(abs_top_builddir)) ; + fi ) endif mkdir -p stamps touch $@