diff options
| -rw-r--r-- | libraries/cfitsio/README | 2 | ||||
| -rw-r--r-- | libraries/cfitsio/cfitsio.SlackBuild | 35 | ||||
| -rw-r--r-- | libraries/cfitsio/cfitsio.info | 6 |
3 files changed, 31 insertions, 12 deletions
diff --git a/libraries/cfitsio/README b/libraries/cfitsio/README index b065ce914d..2f344cd6d6 100644 --- a/libraries/cfitsio/README +++ b/libraries/cfitsio/README @@ -7,7 +7,7 @@ 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 + CFITSIO_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 fedd43e421..2805dc5b9f 100644 --- a/libraries/cfitsio/cfitsio.SlackBuild +++ b/libraries/cfitsio/cfitsio.SlackBuild @@ -1,18 +1,37 @@ #!/bin/sh # Slackware build script for cfitsio -# Written by Dominik Drobek <dominik.drobek (at) o2.pl> + +# Copyright 2011-2016 Dominik Drobek <dominik.drobek (at) o2.pl> +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cfitsio -VERSION=${VERSION:-3.37} +VERSION=${VERSION:-3.39} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -FVER=3370 +FVER=3390 if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -23,8 +42,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -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" @@ -38,9 +57,9 @@ else fi # --enable-reentrant is disabled by default, as it causes problems with legacy software -REENTRANT=${REENTRANT:-no} +CFITSIO_REENTRANT=${CFITSIO_REENTRANT:-no} -if [ "$REENTRANT" = "no" ]; then +if [ "$CFITSIO_REENTRANT" = "no" ]; then USE_REENTRANT="--disable-reentrant" else USE_REENTRANT="--enable-reentrant" diff --git a/libraries/cfitsio/cfitsio.info b/libraries/cfitsio/cfitsio.info index 8467811108..e8b2b84daa 100644 --- a/libraries/cfitsio/cfitsio.info +++ b/libraries/cfitsio/cfitsio.info @@ -1,8 +1,8 @@ PRGNAM="cfitsio" -VERSION="3.37" +VERSION="3.39" HOMEPAGE="http://heasarc.gsfc.nasa.gov/fitsio/" -DOWNLOAD="ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3370.tar.gz" -MD5SUM="abebd2d02ba5b0503c633581e3bfa116" +DOWNLOAD="http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio3390.tar.gz" +MD5SUM="e92dd2a4282a1c50d46167041a29fc67" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |