diff --git a/eclipse-cdt.spec b/eclipse-cdt.spec index 1fbb18f..cac0132 100644 --- a/eclipse-cdt.spec +++ b/eclipse-cdt.spec @@ -30,7 +30,7 @@ Epoch: 1 Summary: Eclipse C/C++ Development Tools (CDT) plugin Name: eclipse-cdt Version: 9.2.1 -Release: 1%{?dist} +Release: 2%{?dist} License: EPL and CPL URL: http://www.eclipse.org/cdt @@ -370,10 +370,8 @@ pushd native/org.eclipse.cdt.native.serial/jni make CFLAGS="-fPIC %{optflags}" ../os/linux/%{eclipse_arch}/libserial.so popd -# Exclude EquinoxResolver to avoid NPE occuring on arm -%ifarch %{arm} -export MAVEN_OPTS="-XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState" -%endif +# Exclude EquinoxResolver to avoid NPE occuring on arm and increase memory for s390 +export MAVEN_OPTS="-Xmx1024m -XX:CompileCommand=exclude,org/eclipse/tycho/core/osgitools/EquinoxResolver,newState" %mvn_build -j -f -- -Dtycho.local.keepTarget -Dskip-ppc64le -Dnative=linux.%{eclipse_arch} @@ -532,6 +530,9 @@ fi %endif %changelog +* Thu Mar 30 2017 Mat Booth - 1:9.2.1-2 +- Increase memory to fix the build on s390 + * Tue Mar 28 2017 Mat Booth - 1:9.2.1-1 - Update to latest upstream release - Conditionalise building of arduino support