r46621 - in /packages/scilab/branches/5.5/debian: changelog rules

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Tue Apr  8 08:11:20 2014
New Revision: 46621

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46621
Log:
Configure --without-modelica on arm64 and ppc64el, apparently the
package wants ocamlopt.

Modified:
    packages/scilab/branches/5.5/debian/changelog
    packages/scilab/branches/5.5/debian/rules

Modified: packages/scilab/branches/5.5/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/changelog?rev=46621&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/changelog	(original)
+++ packages/scilab/branches/5.5/debian/changelog	Tue Apr  8 08:11:20 2014
@@ -3,6 +3,10 @@
   * New snapshot release
   * jh.diff: Fix an issue in the construction of the doc
   * link-issue.diff: Fix a start up segfault (LP: #1299686)
+
+  [ Matthias Klose ]
+  * Configure --without-modelica on arm64 and ppc64el, apparently the
+    package wants ocamlopt.
 
  -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 06 Apr 2014 15:26:17 +0200
 

Modified: packages/scilab/branches/5.5/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/scilab/branches/5.5/debian/rules?rev=46621&op=diff
==============================================================================
--- packages/scilab/branches/5.5/debian/rules	(original)
+++ packages/scilab/branches/5.5/debian/rules	Tue Apr  8 08:11:20 2014
@@ -21,6 +21,12 @@
 	--with-tcl-library=/usr/lib/$(DEB_HOST_MULTIARCH) \
 	--enable-mpi --disable-static-system-lib
 #	--enable-compilation-tests
+
+
+# requires ocamlopt
+ifneq (,$(filter $(DEB_HOST_ARCH),arm64 ppc64el))
+  DEB_CONFIGURE_NORMAL_ARGS += --without-modelica
+endif
 
 DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--no-as-needed"