aboutsummaryrefslogtreecommitdiff
path: root/libraries/cfitsio
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/cfitsio')
-rw-r--r--libraries/cfitsio/README7
-rw-r--r--libraries/cfitsio/cfitsio.SlackBuild15
-rw-r--r--libraries/cfitsio/cfitsio.info8
3 files changed, 23 insertions, 7 deletions
diff --git a/libraries/cfitsio/README b/libraries/cfitsio/README
index f17c2e788a7aa..b065ce914d68b 100644
--- a/libraries/cfitsio/README
+++ b/libraries/cfitsio/README
@@ -4,3 +4,10 @@ is also included for the convenience of Fortran programmers.
The documentation directory contains a comprehensive API reference
guide and instructions on using cfistio in Fortran programs.
+
+If you wish to build the library with the --enable-reentrant option,
+run the SlackBuild script like this:
+ REENTRANT=yes ./cfitsio.SlackBuild
+
+This option is disabled by default because some legacy software will
+not link against reentrant libcfitsio.
diff --git a/libraries/cfitsio/cfitsio.SlackBuild b/libraries/cfitsio/cfitsio.SlackBuild
index 44093de3fe8bb..7cf5694b0aabc 100644
--- a/libraries/cfitsio/cfitsio.SlackBuild
+++ b/libraries/cfitsio/cfitsio.SlackBuild
@@ -4,11 +4,11 @@
# Written by Dominik Drobek <dominik.drobek (at) o2.pl>
PRGNAM=cfitsio
-VERSION=${VERSION:-3.27}
+VERSION=${VERSION:-3.28}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
-FVER=3270
+FVER=3280
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
@@ -37,6 +37,15 @@ else
LIBDIRSUFFIX=""
fi
+# --enable-reentrant is disabled by default, as it causes problems with legacy software
+REENTRANT=${REENTRANT:-no}
+
+if [ "$REENTRANT" = "no" ]; then
+ USE_REENTRANT="--disable-reentrant"
+else
+ USE_REENTRANT="--enable-reentrant"
+fi
+
set -e
rm -rf $PKG
@@ -60,7 +69,7 @@ CXXFLAGS="$SLKCFLAGS" \
--libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
- --enable-reentrant \
+ ${USE_REENTRANT} \
--build=$ARCH-slackware-linux
# Apparently --libdir is ignored
diff --git a/libraries/cfitsio/cfitsio.info b/libraries/cfitsio/cfitsio.info
index 88f86be7af53f..d9df44a2aa77b 100644
--- a/libraries/cfitsio/cfitsio.info
+++ b/libraries/cfitsio/cfitsio.info
@@ -1,10 +1,10 @@
PRGNAM="cfitsio"
-VERSION="3.27"
+VERSION="3.28"
HOMEPAGE="http://heasarc.gsfc.nasa.gov/fitsio/"
-DOWNLOAD="ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3270.tar.gz"
-MD5SUM="2a72b323de3f40ad1a671f2167500336"
+DOWNLOAD="ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3280.tar.gz"
+MD5SUM="fdb9c0f51678b47e78592c70fb5dc793"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
MAINTAINER="Dominik Drobek"
EMAIL="dominik.drobek@o2.pl"
-APPROVED="rworkman"
+APPROVED="dsomero"