From b5d221879c7792a3d4d14dba5bd1f3892b75c4bc Mon Sep 17 00:00:00 2001
From: Serban Udrea <S.Udrea@gsi.de>
Date: Thu, 13 Sep 2012 20:56:46 -0500
Subject: development/numpy: Updated for version 1.6.2.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 development/numpy/README           |  2 ++
 development/numpy/numpy.SlackBuild | 41 +++++++++++++++++++++++++++++++++++---
 development/numpy/numpy.info       |  6 +++---
 3 files changed, 43 insertions(+), 6 deletions(-)

(limited to 'development/numpy')

diff --git a/development/numpy/README b/development/numpy/README
index 26ea118b48..fe0e06e44f 100644
--- a/development/numpy/README
+++ b/development/numpy/README
@@ -8,3 +8,5 @@ interfacing with general-purpose data-base applications.
         
 There are also basic facilities for discrete fourier transform, basic
 linear algebra and random number generation.
+
+If you need to build numpy for debugging, set DEBUG=y.
diff --git a/development/numpy/numpy.SlackBuild b/development/numpy/numpy.SlackBuild
index 592daadb80..011e0d2a4b 100644
--- a/development/numpy/numpy.SlackBuild
+++ b/development/numpy/numpy.SlackBuild
@@ -3,9 +3,13 @@
 # Slackware build script for NumPy
 
 # Written by Aleksandar Samardzic <asamardzic@gmail.com>
+# Updated up to 1.6.2 by Serban Udrea <S.Udrea@gsi.de>
+# Added support for building with debugging symbols (S. Udrea)
+# LIBDIRSUFFIX is now needed to set the proper path for
+# UMFPACK (S. Udrea)
 
 PRGNAM=numpy
-VERSION=${VERSION:-1.6.1}
+VERSION=${VERSION:-1.6.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -17,6 +21,12 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+if [ "$ARCH" = "x86_64" ]; then
+  LIBDIRSUFFIX="64"
+else
+  LIBDIRSUFFIX=""
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=${PKG:-$TMP/package-$PRGNAM}
@@ -37,10 +47,35 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-python setup.py install --root $PKG
+cat > site.cfg <<EOF
+[amd]
+library_dirs = /usr/lib${LIBDIRSUFFIX}
+include_dirs = /usr/include/amd
+amd_libs = amd
+
+[umfpack]
+library_dirs = /usr/lib${LIBDIRSUFFIX}
+include_dirs = /usr/include/umfpack
+umfpack_libs = umfpack
+EOF
+
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+DEBUG=${DEBUG:-no}
+
+case "$DEBUG" in
+ [yY]|[yY][eE][sS]) DEBUG="y" ;;
+                 *) DEBUG="" ;;
+esac
+
+if [ ! "$DEBUG" ]; then
+  python setup.py install --root $PKG
+
+  find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+else
+  python setup.py build --debug
+  python setup.py install --root $PKG
+fi
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COMPATIBILITY DEV_README.txt LICENSE.txt README.txt THANKS.txt\
diff --git a/development/numpy/numpy.info b/development/numpy/numpy.info
index 71de75582e..349d4f60b9 100644
--- a/development/numpy/numpy.info
+++ b/development/numpy/numpy.info
@@ -1,8 +1,8 @@
 PRGNAM="numpy"
-VERSION="1.6.1"
+VERSION="1.6.2"
 HOMEPAGE="http://numpy.scipy.org/"
-DOWNLOAD="http://freefr.dl.sourceforge.net/project/numpy/NumPy/1.6.1/numpy-1.6.1.tar.gz"
-MD5SUM="2bce18c08fc4fce461656f0f4dd9103e"
+DOWNLOAD="http://freefr.dl.sourceforge.net/project/numpy/NumPy/1.6.2/numpy-1.6.2.tar.gz"
+MD5SUM="95ed6c9dcc94af1fc1642ea2a33c1bba"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3