Mercurial > hg > release > icedtea6-1.4.1
changeset 332:2a1d80a4c7b4
2007-11-07 Lillian Angel <langel@redhat.com>
* Makefile.am: Removed docs patch.
* Makefile.in: Regenerate.
* patches/icedtea-docs.patch: Removed. Causing out of memory errors
because jaxws is not built.
author | Lillian Angel <langel@redhat.com> |
---|---|
date | Thu, 08 Nov 2007 10:45:26 -0500 |
parents | f9a0a601f0dc |
children | cd2a405502f1 |
files | Makefile.am Makefile.in patches/icedtea-docs.patch |
diffstat | 3 files changed, 0 insertions(+), 44 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Wed Nov 07 17:29:12 2007 -0500 +++ b/Makefile.am Thu Nov 08 10:45:26 2007 -0500 @@ -186,7 +186,6 @@ patches/icedtea-javafiles.patch \ patches/icedtea-bytecodeInterpreterWithChecks.patch \ patches/icedtea-corba.patch \ - patches/icedtea-docs.patch \ $(FAST_BUILD_PATCH) \ $(DISTRIBUTION_PATCHES)
--- a/Makefile.in Wed Nov 07 17:29:12 2007 -0500 +++ b/Makefile.in Thu Nov 08 10:45:26 2007 -0500 @@ -305,7 +305,6 @@ patches/icedtea-javafiles.patch \ patches/icedtea-bytecodeInterpreterWithChecks.patch \ patches/icedtea-corba.patch \ - patches/icedtea-docs.patch \ $(FAST_BUILD_PATCH) \ $(DISTRIBUTION_PATCHES)
--- a/patches/icedtea-docs.patch Wed Nov 07 17:29:12 2007 -0500 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,42 +0,0 @@ ---- ../openjdk/control/make/j2se-rules.gmk 2007-10-12 03:45:09.000000000 -0400 -+++ openjdk/control/make/j2se-rules.gmk 2007-11-07 17:05:36.000000000 -0500 -@@ -36,37 +36,9 @@ - IMAGES_TARGET = images - endif - --# No DOCS build when JDK_UPDATE_VERSION set --ifdef JDK_UPDATE_VERSION -- DOCS_TARGET = --else -- DOCS_TARGET = docs --endif -- --# NO_DOCS may be set in conjunction with DEV_ONLY --ifdef NO_DOCS -- DOCS_TARGET = --endif -+DOCS_TARGET = docs - --# If langtools not being built, full jdk javadoc is not possible --ifneq ($(BUILD_LANGTOOLS), true) -- DOCS_TARGET = --endif --ifneq ($(BUILD_CORBA), true) -- DOCS_TARGET = --endif --ifneq ($(BUILD_JAXP), true) -- DOCS_TARGET = --endif --ifneq ($(BUILD_JAXWS), true) -- DOCS_TARGET = --endif -- --ifndef DEV_ONLY -- J2SE_BUILD_TARGETS = sanity all $(DOCS_TARGET) images --else -- J2SE_BUILD_TARGETS = sanity all $(IMAGES_TARGET) --endif -+J2SE_BUILD_TARGETS = sanity all $(DOCS_TARGET) images - - J2SE_CLOBBER_TARGETS = clobber -