diff options
Diffstat (limited to 'lang/openjdk7/patches/patch-am')
| -rw-r--r-- | lang/openjdk7/patches/patch-am | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/lang/openjdk7/patches/patch-am b/lang/openjdk7/patches/patch-am index a8626b667f3..dbf9f00b99e 100644 --- a/lang/openjdk7/patches/patch-am +++ b/lang/openjdk7/patches/patch-am @@ -1,10 +1,10 @@ -$NetBSD: patch-am,v 1.4 2013/06/15 09:31:05 jperkin Exp $ +$NetBSD: patch-am,v 1.5 2014/09/13 14:35:25 joerg Exp $ Set username to pkgsrc. ---- jdk/make/common/shared/Defs.gmk.orig 2013-05-29 03:57:57.000000000 +0000 +--- jdk/make/common/shared/Defs.gmk.orig 2014-01-01 05:53:33.000000000 +0000 +++ jdk/make/common/shared/Defs.gmk -@@ -303,7 +303,7 @@ else +@@ -301,7 +301,7 @@ ifndef BUILD_NUMBER BUILD_NUMBER = b00 ifndef USER_RELEASE_SUFFIX BUILD_DATE := $(shell $(DATE) '+%Y_%m_%d_%H_%M') @@ -13,3 +13,12 @@ Set username to pkgsrc. USER_RELEASE_SUFFIX := $(shell $(ECHO) "$(CLEAN_USERNAME)_$(BUILD_DATE)" | $(TR) '[:upper:]' '[:lower:]' ) endif export USER_RELEASE_SUFFIX +@@ -615,7 +615,7 @@ endif + # To workaround this we will specify JAVA_HOME explicitly + + ANT_TMPDIR = $(ABS_OUTPUTDIR)/tmp +-ANT_WORKAROUNDS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR)' JAVA_HOME='$(BOOTDIR)' ++ANT_WORKAROUNDS = ANT_OPTS=-Djava.io.tmpdir='$(ANT_TMPDIR)'\ -XX:+UseSerialGC\ -mx1024m JAVA_HOME='$(BOOTDIR)' + + ifeq ($(ANT_HOME),) + ANT = $(ANT_WORKAROUNDS) ant |