Skip to content

Commit

Permalink
GSL: update to provide GSL 2.7
Browse files Browse the repository at this point in the history
  • Loading branch information
rhaas80 committed Dec 23, 2021
1 parent 122cf2d commit 8ba8e8f
Show file tree
Hide file tree
Showing 6 changed files with 2 additions and 34 deletions.
1 change: 1 addition & 0 deletions configuration.ccl
Expand Up @@ -5,6 +5,7 @@ PROVIDES GSL
SCRIPT src/detect.sh
LANG bash
OPTIONS GSL_DIR GSL_INSTALL_DIR GSL_LIBS
VERSION 2.7
}

# Pass configuration options to build script
Expand Down
Binary file removed dist/gsl-1.16.tar.gz
Binary file not shown.
Binary file added dist/gsl-2.7.tar.gz
Binary file not shown.
5 changes: 0 additions & 5 deletions dist/patchtest.patch

This file was deleted.

12 changes: 0 additions & 12 deletions dist/stdarg.patch

This file was deleted.

18 changes: 1 addition & 17 deletions src/build.sh
Expand Up @@ -14,7 +14,7 @@ set -e # Abort on errors

# Set locations
THORN=GSL
NAME=gsl-1.16
NAME=gsl-2.7
SRCDIR="$(dirname $0)"
BUILD_DIR=${SCRATCH_BUILD}/build/${THORN}
if [ -z "${GSL_INSTALL_DIR}" ]; then
Expand Down Expand Up @@ -43,22 +43,6 @@ mkdir ${BUILD_DIR} ${INSTALL_DIR}
echo "GSL: Unpacking archive..."
pushd ${BUILD_DIR}
${TAR?} xzf ${SRCDIR}/../dist/${NAME}.tar.gz
pushd ${NAME}
${PATCH?} -p1 < ${SRCDIR}/../dist/stdarg.patch
# Some (ancient but still used) versions of patch don't support the
# patch format used here but also don't report an error using the exit
# code. So we use this patch to test for this
${PATCH?} -p1 < ${SRCDIR}/../dist/patchtest.patch
if [ ! -e .patch_tmp ]; then
echo 'BEGIN ERROR'
echo 'The version of patch is too old to understand this patch format.'
echo 'Please set the PATCH environment variable to a more recent '
echo 'version of the patch command.'
echo 'END ERROR'
exit 1
fi
rm -f .patch_tmp
popd

echo "GSL: Configuring..."
cd ${NAME}
Expand Down

0 comments on commit 8ba8e8f

Please sign in to comment.