[scilab] Log the Heap space error on arm builders

Clément David davidcl at fedoraproject.org
Wed Oct 9 09:37:44 UTC 2013


commit 9551bb37658c8034900b9c74299588009571c218
Author: Clément DAVID <clement.david at scilab-enterprises.com>
Date:   Wed Oct 9 11:32:35 2013 +0200

    Log the Heap space error on arm builders

 scilab-0003-fix-arm-build.patch |   12 ++++++++++++
 scilab.spec                     |    3 +++
 2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/scilab-0003-fix-arm-build.patch b/scilab-0003-fix-arm-build.patch
new file mode 100644
index 0000000..838d888
--- /dev/null
+++ b/scilab-0003-fix-arm-build.patch
@@ -0,0 +1,12 @@
+--- a/modules/helptools/src/java/org/scilab/modules/helptools/SciDocMain.java
++++ b/modules/helptools/src/java/org/scilab/modules/helptools/SciDocMain.java
+@@ -165,6 +165,9 @@ public final class SciDocMain {
+         } catch (Exception e) {
+             System.err.println("An error occurred during the conversion:\n");
+             e.printStackTrace();
++        } catch (Error e) {
++            System.err.println("An error occurred during the conversion:\n");
++            e.printStackTrace();
+         }
+ 
+         return fileToExec;
diff --git a/scilab.spec b/scilab.spec
index 759b439..b2c844c 100644
--- a/scilab.spec
+++ b/scilab.spec
@@ -56,6 +56,8 @@ Patch1:         %{name}-0001-Use-pkcon-to-install-doc-package.patch
 # Bug 64307 - Use dynamic stack on 32-bit to avoid miscompilation
 # http://bugzilla.scilab.org/show_bug.cgi?id=12625
 Patch2:         %{name}-0002-always-use-dynamic-stack.patch
+# Track heap space error on arm builders
+Patch3:         %{name}-0003-fix-arm-build.patch
 
 # Dependencies are extracted from :
 # "http://wiki.scilab.org/Dependencies of Scilab 5.X"
@@ -224,6 +226,7 @@ This package provide test files for Scilab.
 
 %patch1 -p1 -b .pkgcon
 %patch2 -p1 -b .stack
+%patch3 -p1 -b .arm
 
 # Fix Class-Path in manifest
 sed -i '/name="Class-Path"/d' build.incl.xml


More information about the scm-commits mailing list