1 files changed, 41 insertions, 19 deletions
diff --git a/development/numpy3/numpy3.SlackBuild b/development/numpy3/numpy3.SlackBuild
index ad074a021a..fd3b2febbe 100644
--- a/development/numpy3/numpy3.SlackBuild
+++ b/development/numpy3/numpy3.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for numpy3
 
-# Copyright 2015 Christoph Willing  Brisbane, Australia
+# Copyright 2015-2016 Christoph Willing  Brisbane, Australia
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -27,22 +27,22 @@
 
 PRGNAM=numpy3
 SRCNAM=numpy
-VERSION=${VERSION:-1.9.1}
+VERSION=${VERSION:-1.11.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-PYTHON_VERSIONS="3"	;# NOTE! Could easily be PYTHON_VERSIONS="2 3"
+PYTHON_VERSIONS="3"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-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"
@@ -66,7 +66,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+tar xf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -75,21 +75,43 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-cat > site.cfg <<EOF
-[amd]
-library_dirs = /usr/lib${LIBDIRSUFFIX}
-include_dirs = /usr/include/amd
-amd_libs = amd
+# You may want to force numpy to link against a special kind of ATLAS
+#
+ATLAS_SHARED="${ATLAS_SHARED:-yes}"
+ATLAS_SHARED=$(echo "$ATLAS_SHARED"|cut -b 1|tr a-z A-Z)
+ATLAS_NO_THREADS="${ATLAS_NO_THREADS:-no}"
+ATLAS_NO_THREADS=$(echo "$ATLAS_NO_THREADS"|cut -b 1|tr a-z A-Z)
+
+if [ "$ATLAS_SHARED" = "Y" ]; then
+  if [ "$ATLAS_NO_THREADS" = "Y" ]; then
+    echo -e "[atlas]\natlas_libs = satlas" >> site.cfg
+    echo -e "lapack_libs = satlas\nlapack_atlas = satlas\n" >> site.cfg
+  fi
+else
+  if [ "$ATLAS_NO_THREADS" = "Y" ]; then
+    echo -e "[atlas]\natlas_libs = f77blas,cblas,atlas" >> site.cfg
+    echo -e "lapack_libs = lapack\nlapack_atlas = lapack\n" >> site.cfg
+  else
+    echo -e "[atlas]\natlas_libs = ptf77blas,ptcblas,atlas" >> site.cfg
+    echo -e "lapack_libs = ptlapack\nlapack_atlas = ptlapack\n" >> site.cfg
+  fi
+fi
 
-[umfpack]
-library_dirs = /usr/lib${LIBDIRSUFFIX}
-include_dirs = /usr/include/umfpack
-umfpack_libs = umfpack
-EOF
+NO_UMFPACK=${NO_UMFPACK:-yes}
+case "$NO_UMFPACK" in
+ [yY]|[yY][eE][sS]) NO_UMFPACK="y" ;;
+                 *) NO_UMFPACK="" ;;
+esac
 
+if [ ! "$NO_UMFPACK" ]; then
+  echo -e "[amd]\nlibrary_dirs = /usr/lib${LIBDIRSUFFIX}" >> site.cfg
+  echo -e "include_dirs = /usr/include/amd\namd_libs = amd\n" >> site.cfg
+  echo -e "[umfpack]\nlibrary_dirs = /usr/lib${LIBDIRSUFFIX}" >> site.cfg
+  echo -e "include_dirs = /usr/include/umfpack\numfpack_libs = umfpack\n" \
+          >> site.cfg
+fi
 
 DEBUG=${DEBUG:-no}
-
 case "$DEBUG" in
  [yY]|[yY][eE][sS]) DEBUG="y" ;;
                  *) DEBUG="" ;;
@@ -110,7 +132,7 @@ for v in $PYTHON_VERSIONS ; do
 done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COMPATIBILITY DEV_README.txt LICENSE.txt README.txt THANKS.txt \
+cp -a CONTRIBUTING.md INSTALL.rst.txt LICENSE.txt README.md THANKS.txt \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc -type f -exec chmod 0644 {} \;