From 8d7bf0297eda0916fa227e1e461ba5a6049d6058 Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.research@googlemail.com>
Date: Wed, 1 Jun 2016 21:22:09 +0100
Subject: academic/armadillo: Updated for version 7.100.3.

Signed-off-by: David Spencer <baildon.research@googlemail.com>
---
 academic/armadillo/armadillo.SlackBuild | 18 ++----------------
 academic/armadillo/armadillo.info       |  6 +++---
 2 files changed, 5 insertions(+), 19 deletions(-)

(limited to 'academic')

diff --git a/academic/armadillo/armadillo.SlackBuild b/academic/armadillo/armadillo.SlackBuild
index 17831f3d39..d627a6df2b 100644
--- a/academic/armadillo/armadillo.SlackBuild
+++ b/academic/armadillo/armadillo.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=armadillo
-VERSION=${VERSION:-4.650.2}
+VERSION=${VERSION:-7.100.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,27 +56,13 @@ else
   LIBDIRSUFFIX=""
 fi
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.xz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
diff --git a/academic/armadillo/armadillo.info b/academic/armadillo/armadillo.info
index f8d4345459..c9a9745d47 100644
--- a/academic/armadillo/armadillo.info
+++ b/academic/armadillo/armadillo.info
@@ -1,8 +1,8 @@
 PRGNAM="armadillo"
-VERSION="4.650.2"
+VERSION="7.100.3"
 HOMEPAGE="http://arma.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/arma/files/armadillo-4.650.2.tar.gz"
-MD5SUM="c8e5c94e5d3753fa5cdb2080598ccdfb"
+DOWNLOAD="http://sourceforge.net/projects/arma/files/armadillo-7.100.3.tar.xz"
+MD5SUM="d047c1c24f4031e0e9374a7104e33ec0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3