[openjfx] 01/01: * Increase maximum heap space for the s390x build.

[Matthias Klose]

This is an automated email from the git hooks/post-receive script.

doko pushed a commit to branch master
in repository openjfx.

commit f779ae91c0050470b41b974a7c9988a4c97c533b
Author: Matthias Klose <doko at ubuntu.com>
Date:   Fri Oct 9 07:42:06 2015 +0200

      * Increase maximum heap space for the s390x build.
---
 debian/changelog | 5 +++--
 debian/rules     | 8 +++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f51fd11..8534d67 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-openjfx (8u60-b27-3) UNRELEASED; urgency=medium
+openjfx (8u60-b27-3) unstable; urgency=medium
 
   * Kill more -m32 settings.
+  * Increase maximum heap space for the s390x build.
 
- -- Matthias Klose <doko at ubuntu.com>  Thu, 08 Oct 2015 18:05:59 +0200
+ -- Matthias Klose <doko at ubuntu.com>  Fri, 09 Oct 2015 07:14:06 +0200
 
 openjfx (8u60-b27-2) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 807f00a..ae28941 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,12 @@ ifneq (,$(filter $(DEB_HOST_ARCH), armel armhf arm64 mips mipsel))
   gradle_debug = --debug
 endif
 
+# FIXME: looks like s390x is recognized as a 32bit arch ...
+# more heap on s390x needed
+ifneq (,$(filter $(DEB_HOST_ARCH), s390x))
+  SET_JAVA_OPTS = JAVA_OPTS=-Xmx2304m
+endif
+
 export JAVA_HOME    = /usr/lib/jvm/java-8-openjdk-$(DEB_HOST_ARCH)
 export OPENJFX_HOME = /usr/share/java/openjfx
 export QT_SELECT    = qt5
@@ -38,7 +44,7 @@ override_dh_auto_build:
 	cp modules/web/src/main/java/com/sun/webkit/dom/JSObject.java    modules/web/build/linux/Release/WebCore/generated/java/com/sun/webkit/dom/
 	cp modules/web/src/main/java/com/sun/webkit/perf/PerfLogger.java modules/web/build/linux/Release/WebCore/generated/java/com/sun/webkit/perf/
 
-	gradle --offline --stacktrace $(gradle_debug) --refresh-dependencies --gradle-user-home .gradle
+	$(SET_JAVA_OPTS) gradle --offline --stacktrace $(gradle_debug) --refresh-dependencies --gradle-user-home .gradle
 
 override_dh_install:
 	dh_install -i

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjfx.git