From 727a55eec1c1fe9be9094b1098a622e7a1f91f26 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Fri, 22 Dec 2017 00:33:08 +0100
Subject: deps: updates and recompilations

---
 deps/cfitsio/cfitsio.SlackBuild | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'deps/cfitsio/cfitsio.SlackBuild')

diff --git a/deps/cfitsio/cfitsio.SlackBuild b/deps/cfitsio/cfitsio.SlackBuild
index 70efe61..6170ccf 100755
--- a/deps/cfitsio/cfitsio.SlackBuild
+++ b/deps/cfitsio/cfitsio.SlackBuild
@@ -22,13 +22,13 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=cfitsio
-VERSION=${VERSION:-3.410}
+VERSION=${VERSION:-3.420}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
     *) ARCH=$(uname -m) ;;
@@ -40,8 +40,8 @@ CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   SLKLDFLAGS=""
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
@@ -92,9 +92,13 @@ LDFLAGS="$SLKLDFLAGS" \
   --build=$TARGET
 
 # Build and install:
-make || exit 1
+make shared || exit 1
+make utils || exit 1
 make install DESTDIR=$PKG || exit 1
 
+# Remove the static library:
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libcfitsio.a
+
 # Strip binaries (if any):
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-- 
cgit v1.2.3