diff --git a/configuration.ccl b/configuration.ccl index 696ef5c..c40301f 100644 --- a/configuration.ccl +++ b/configuration.ccl @@ -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 diff --git a/dist/gsl-1.16.tar.gz b/dist/gsl-1.16.tar.gz deleted file mode 100644 index ad68e06..0000000 Binary files a/dist/gsl-1.16.tar.gz and /dev/null differ diff --git a/dist/gsl-2.7.tar.gz b/dist/gsl-2.7.tar.gz new file mode 100644 index 0000000..75fb995 Binary files /dev/null and b/dist/gsl-2.7.tar.gz differ diff --git a/dist/patchtest.patch b/dist/patchtest.patch deleted file mode 100644 index 837e2c2..0000000 --- a/dist/patchtest.patch +++ /dev/null @@ -1,5 +0,0 @@ -diff --new-file -ru a/.patch_tmp b/.patch_tmp ---- a/.patch_tmp 1969-12-31 18:00:00.000000000 -0600 -+++ b/.patch_tmp 2010-06-24 19:43:15.000000000 -0500 -@@ -0,0 +1 @@ -+ diff --git a/dist/stdarg.patch b/dist/stdarg.patch deleted file mode 100644 index 1ef6010..0000000 --- a/dist/stdarg.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru gsl-1.16-orig/test/results.c gsl-1.16/test/results.c ---- gsl-1.16-orig/test/results.c 2013-07-17 13:04:26.000000000 -0700 -+++ gsl-1.16/test/results.c 2015-04-28 13:24:11.901318472 -0700 -@@ -29,7 +29,7 @@ - #ifdef STDC_HEADERS - #include - #else --#include -+#include - #endif - #endif - diff --git a/src/build.sh b/src/build.sh index 26b4dd8..49d2d4e 100755 --- a/src/build.sh +++ b/src/build.sh @@ -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 @@ -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}