blob: dbf9f00b99ea986b7898d5b0743477e41bbd81bd (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
$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 2014-01-01 05:53:33.000000000 +0000
+++ jdk/make/common/shared/Defs.gmk
@@ -301,7 +301,7 @@ ifndef BUILD_NUMBER
BUILD_NUMBER = b00
ifndef USER_RELEASE_SUFFIX
BUILD_DATE := $(shell $(DATE) '+%Y_%m_%d_%H_%M')
- CLEAN_USERNAME := $(shell $(ECHO) "$(USER)" | $(TR) -d -c '[:alnum:]')
+ CLEAN_USERNAME := 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
|