From 9a216079554eb4d61d5d942b11a4e6ac89648d8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Thu, 20 Nov 2014 09:06:51 +0100 Subject: [PATCH] - Don't override Java memory settings on s390 (related to bug #1115920) Conflicts: vtk.spec --- vtk.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vtk.spec b/vtk.spec index b6860d4..9623786 100644 --- a/vtk.spec +++ b/vtk.spec @@ -205,8 +205,10 @@ export CXXFLAGS="%{optflags} -D_UNICODE" export JAVA_HOME=/usr/lib/jvm/java # Arm/Aarch64 builders have less ram # https://bugzilla.redhat.com/show_bug.cgi?id=1115920 +%ifnarch s390 export JAVA_TOOL_OPTIONS=-Xmx2048m %endif +%endif mkdir build pushd build @@ -456,6 +458,7 @@ cp -pr --parents Wrapping/*/README* _docs/ %changelog * Sun Dec 13 2015 Orion Poplawski - 6.1.0-5 - Add patch to fix compilation with mesa 10.4 (bug #1291099) +- Don't override Java memory settings on s390 (related to bug #1115920) - Increase java heap space for builds (bug #1115920) - Add requires on blas-devel and lapack-devel to vtk-devel (bug #1105004) - Add Requires: qtwebkit-devel and hdf5-devel to vtk-devel (bug #1080781)