[arch-commits] Commit in octave/trunk (PKGBUILD octave-sundials4.patch)

[Antonio Rojas]

    Date: Saturday, March 16, 2019 @ 22:40:11
  Author: arojas
Revision: 442251

netcdf 4.6.3 rebuild

Modified:
  octave/trunk/PKGBUILD
  octave/trunk/octave-sundials4.patch

------------------------+
 PKGBUILD               |    9 ++++-----
 octave-sundials4.patch |    3 +--
 2 files changed, 5 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-16 22:21:02 UTC (rev 442250)
+++ PKGBUILD	2019-03-16 22:40:11 UTC (rev 442251)
@@ -4,7 +4,7 @@
 
 pkgname=octave
 pkgver=5.1.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A high-level language, primarily intended for numerical computations."
 arch=('x86_64')
 url="http://www.octave.org"
@@ -23,7 +23,7 @@
 validpgpkeys=('DBD9C84E39FE1AAE99F04446B05F05B75D36644B')  # John W. Eaton
 sha512sums=('a842fb50c13f25e9d425fe9a2c71d9433d7e125747d2175efe0c9b2a780c799d9ce1ee085b5a13fbfedb7990b0ba5d11079d880ddb3bdb66782efc321390eebb'
             'SKIP'
-            'c05514859d661c8064973c4728ab68a91ca97910792b9ee6deee28748c79867b1204517775fe12f716e23576632f7b741bfe90c79ada288a1f57b58877b0fd76')
+            '4b743602e8ca91e8be8dab69e09d3e476e9edd867b2eb0b9816fbe4ca344a16bff7a413c2e89b0c9fb769f4a815a696c4d67b70282b7e4fe8c24598bcce90d34')
 
 prepare() {
   cd $pkgname-$pkgver
@@ -35,9 +35,8 @@
   cd ${pkgname}-${pkgver}
 
   ./configure --prefix=/usr --libexecdir=/usr/lib \
-  --enable-shared --disable-static \
-  --with-quantum-depth=16 \
-  --with-sundials_ida="-lsundials_ida -lsundials_sunlinsolklu"
+  --enable-shared --disable-static --enable-link-all-dependencies \
+  --with-quantum-depth=16
 
   make
 }

Modified: octave-sundials4.patch
===================================================================
--- octave-sundials4.patch	2019-03-16 22:21:02 UTC (rev 442250)
+++ octave-sundials4.patch	2019-03-16 22:40:11 UTC (rev 442251)
@@ -297,7 +297,7 @@
 diff --git a/libinterp/dldfcn/__ode15__.cc b/libinterp/dldfcn/__ode15__.cc
 --- a/libinterp/dldfcn/__ode15__.cc
 +++ b/libinterp/dldfcn/__ode15__.cc
-@@ -45,15 +45,32 @@
+@@ -45,15 +45,31 @@
  #    include <ida/ida.h>
  #  endif
  
@@ -323,7 +323,6 @@
 +
 +#  if defined (HAVE_SUNDIALS_SUNDIALS_SPARSE_H)
  #    include <sundials/sundials_sparse.h>
-+#    include <sunmatrix/sunmatrix_sparse.h>
  #  endif
  
 +