summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--academic/armadillo/README8
-rw-r--r--academic/armadillo/armadillo.SlackBuild10
-rw-r--r--academic/armadillo/armadillo.info6
3 files changed, 12 insertions, 12 deletions
diff --git a/academic/armadillo/README b/academic/armadillo/README
index 4f4df4bec5..17bef8f786 100644
--- a/academic/armadillo/README
+++ b/academic/armadillo/README
@@ -1,7 +1,7 @@
-Armadillo is a high quality C++ linear algebra library useful
-for development of algorithms in machine learning, pattern recognition,
-signal processing, bioinformatics, statistics, etc.
-
+Armadillo is a high quality C++ linear algebra library useful
+for development of algorithms in machine learning, pattern recognition,
+signal processing, bioinformatics, statistics, etc.
+
Armadillo makes extensive use of template meta-programming, recursive templates
and template based function overloading. As such, C++ compilers which do not
fully implement the C++ standard may not work correctly.
diff --git a/academic/armadillo/armadillo.SlackBuild b/academic/armadillo/armadillo.SlackBuild
index d627a6df2b..2035220bdb 100644
--- a/academic/armadillo/armadillo.SlackBuild
+++ b/academic/armadillo/armadillo.SlackBuild
@@ -23,15 +23,15 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=armadillo
-VERSION=${VERSION:-7.100.3}
+VERSION=${VERSION:-8.100.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
DOCS="README.txt examples/ index.html LICENSE.txt docs.html rcpp_armadillo_csda_2014.pdf"
-if [-z "$ARCH" ]; then
+if [ -z "$ARCH" ]; then
case "$(uname -m)" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$(uname -m) ;;
esac
@@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
diff --git a/academic/armadillo/armadillo.info b/academic/armadillo/armadillo.info
index c9a9745d47..9d8c336afc 100644
--- a/academic/armadillo/armadillo.info
+++ b/academic/armadillo/armadillo.info
@@ -1,8 +1,8 @@
PRGNAM="armadillo"
-VERSION="7.100.3"
+VERSION="8.100.0"
HOMEPAGE="http://arma.sourceforge.net/"
-DOWNLOAD="http://sourceforge.net/projects/arma/files/armadillo-7.100.3.tar.xz"
-MD5SUM="d047c1c24f4031e0e9374a7104e33ec0"
+DOWNLOAD="http://sourceforge.net/projects/arma/files/armadillo-8.100.0.tar.xz"
+MD5SUM="5f4aa46d15d9d364874fa4bde1a7add0"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""