summaryrefslogtreecommitdiffstats
path: root/deps/cfitsio
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2017-12-22 00:33:08 +0100
committer Eric Hameleers <alien@slackware.com>2017-12-22 00:33:08 +0100
commit727a55eec1c1fe9be9094b1098a622e7a1f91f26 (patch)
tree18ad1a4f0b9e6654b2a5d1ee7899106abb1f3c49 /deps/cfitsio
parentefc2d632e715498adf632904e2425a5d89e1e44f (diff)
downloadktown-727a55eec1c1fe9be9094b1098a622e7a1f91f26.tar.gz
ktown-727a55eec1c1fe9be9094b1098a622e7a1f91f26.tar.xz
deps: updates and recompilations
Diffstat (limited to 'deps/cfitsio')
-rw-r--r--deps/cfitsio/.url2
-rwxr-xr-xdeps/cfitsio/cfitsio.SlackBuild14
2 files changed, 10 insertions, 6 deletions
diff --git a/deps/cfitsio/.url b/deps/cfitsio/.url
index 9e1b756..6a97bc1 100644
--- a/deps/cfitsio/.url
+++ b/deps/cfitsio/.url
@@ -1,2 +1,2 @@
-http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio3410.tar.gz
+http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio3420.tar.gz
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