diff options
Diffstat (limited to 'user/gsl')
| -rw-r--r-- | user/gsl/APKBUILD | 53 | ||||
| -rw-r--r-- | user/gsl/aarch64-test-failure.patch | 13 | ||||
| -rw-r--r-- | user/gsl/dont-disable-deprecated.patch | 24 | ||||
| -rw-r--r-- | user/gsl/static-inline.patch | 12 |
4 files changed, 51 insertions, 51 deletions
diff --git a/user/gsl/APKBUILD b/user/gsl/APKBUILD index 4d2a5d929..8c694d429 100644 --- a/user/gsl/APKBUILD +++ b/user/gsl/APKBUILD @@ -1,8 +1,8 @@ # Contributor: Natanael Copa <ncopa@alpinelinux.org> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gsl -pkgver=2.5 -pkgrel=1 +pkgver=2.8 +pkgrel=0 pkgdesc="Modern numerical library for C and C++" url="https://www.gnu.org/software/gsl/gsl.html" arch="all" @@ -11,17 +11,45 @@ depends="" makedepends="" subpackages="$pkgname-dev $pkgname-doc" source="https://ftp.gnu.org/gnu/gsl/gsl-$pkgver.tar.gz - dont-disable-deprecated.patch - aarch64-test-failure.patch gsl-2.4-portable.patch + static-inline.patch " -# dont-disable-deprecated.patch is workaround for: -# https://github.com/SciRuby/rb-gsl/issues/40 +prepare() { + default_prepare + + case "$CTARGET_ARCH" in + pmmx) #763 (applies to this entire block) + override="multifit_nlinear multilarge_nlinear specfunc"; + for k in $override; do + sed -i $k/Makefile.in \ + -e '/^CFLAGS = /s/$/ -O0/g' \ + ; + done + skipthis="spmatrix"; + for k in $skipthis; do + sed -i $k/Makefile.in \ + -e '/^TESTS = /d' \ + ; + done + ;; + ppc) #764 (applies to this entire block) + skipthis="complex"; + for k in $skipthis; do + sed -i $k/Makefile.in \ + -e '/^TESTS = /d' \ + ; + done + ;; + esac +} build() { - cd "$builddir" - [ $CTARGET_ARCH != "ppc" ] || export ac_cv_c_ieee_interface=unknown + case "$CTARGET_ARCH" in + ppc) export ac_cv_c_ieee_interface=unknown; + ;; + esac + ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -30,16 +58,13 @@ build() { } check() { - cd "$builddir" make check } package() { - cd "$builddir" make DESTDIR="$pkgdir" install } -sha512sums="5b4c5c023f9029ce220f4e09aa4d0234fed94d42ac224d58fda095fe0532d54237a7c33278f8b5d0ba051f6004486edb38d0adb4fcb49337a8c1d8a18cf4a24a gsl-2.5.tar.gz -88d40e599a9e619d8968f9848a91c54492d99032734371ee23072c8dae9d9920da445c1f8a880baa613479facec4afca3d3dec1070c240e5dfd5a662a41c92e8 dont-disable-deprecated.patch -68b685270a377341b3c3ce566ae6eff4ebfc27b75a73f3c7915c57446798bdcca7c1d9f0fa4ce8a50118b371bfe3e2947f9bf33590c86e85db8e807b3b0deae6 aarch64-test-failure.patch -f6a22e82c8f4a1d5ea7b647cbd015cdb9d2e4e9d39728e8f2dba3fdefac64d3f7c8fbc5ec597e6ab315ec1bd49e0e3af4aba091b358a68d9d789884331f4be24 gsl-2.4-portable.patch" +sha512sums="4427f6ce59dc14eabd6d31ef1fcac1849b4d7357faf48873aef642464ddf21cc9b500d516f08b410f02a2daa9a6ff30220f3995584b0a6ae2f73c522d1abb66b gsl-2.8.tar.gz +f6a22e82c8f4a1d5ea7b647cbd015cdb9d2e4e9d39728e8f2dba3fdefac64d3f7c8fbc5ec597e6ab315ec1bd49e0e3af4aba091b358a68d9d789884331f4be24 gsl-2.4-portable.patch +7aa882af7136b6948124885eec6b9bdb2703f581d1656488a6aab8c48f601690fa87f2d6d2566c3a8fa200a5c09310ee076aec847779490ff02e03a5bcd0a2a0 static-inline.patch" diff --git a/user/gsl/aarch64-test-failure.patch b/user/gsl/aarch64-test-failure.patch deleted file mode 100644 index 0b6e80380..000000000 --- a/user/gsl/aarch64-test-failure.patch +++ /dev/null @@ -1,13 +0,0 @@ -https://lists.gnu.org/archive/html/help-gsl/2017-02/msg00002.html - ---- gsl-2.4/linalg/test_cholesky.c.old 2017-06-19 10:00:43.000000000 +0000 -+++ gsl-2.4/linalg/test_cholesky.c 2018-05-30 07:37:04.835628069 +0000 -@@ -551,7 +551,7 @@ - if (N <= 4) - { - create_hilbert_matrix2(m); -- test_mcholesky_invert_eps(m, 256.0 * N * GSL_DBL_EPSILON, "mcholesky_invert unscaled hilbert"); -+ test_mcholesky_invert_eps(m, 512.0 * N * GSL_DBL_EPSILON, "mcholesky_invert unscaled hilbert"); - } - - gsl_matrix_free(m); diff --git a/user/gsl/dont-disable-deprecated.patch b/user/gsl/dont-disable-deprecated.patch deleted file mode 100644 index 40a7c3bce..000000000 --- a/user/gsl/dont-disable-deprecated.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -urp gsl-2.2.1/configure.ac patched/configure.ac ---- gsl-2.2.1/configure.ac 2016-08-31 15:54:07.000000000 +0100 -+++ patched/configure.ac 2017-01-31 14:52:10.000000000 +0000 -@@ -575,10 +575,6 @@ AH_BOTTOM([#if defined(GSL_RANGE_CHECK_O - AH_BOTTOM([#define RETURN_IF_NULL(x) if (!x) { return ; } - ]) - --AH_VERBATIM([GSL_DISABLE_DEPRECATED], --[/* Disable deprecated functions and enums while building */ --#define GSL_DISABLE_DEPRECATED 1]) -- - dnl - AC_CONFIG_FILES([ \ - Makefile \ ---- gsl-2.2.1/config.h.in 2016-08-31 15:54:51.000000000 +0100 -+++ patched/config.h.in 2017-01-31 16:01:17.000000000 +0000 -@@ -1,8 +1,5 @@ - /* config.h.in. Generated from configure.ac by autoheader. */ - --/* Disable deprecated functions and enums while building */ --#define GSL_DISABLE_DEPRECATED 1 -- - /* Define if you have inline with C99 behavior */ - #undef HAVE_C99_INLINE diff --git a/user/gsl/static-inline.patch b/user/gsl/static-inline.patch new file mode 100644 index 000000000..4f89f30da --- /dev/null +++ b/user/gsl/static-inline.patch @@ -0,0 +1,12 @@ +diff -ur a/gsl_inline.h b/gsl_inline.h +--- a/gsl_inline.h 2024-06-05 08:59:43.655369544 -0500 ++++ b/gsl_inline.h 2024-06-05 09:00:02.707862690 -0500 +@@ -49,7 +49,7 @@ + #ifdef HAVE_INLINE + # if defined(__GNUC_STDC_INLINE__) || defined(GSL_C99_INLINE) || defined(HAVE_C99_INLINE) + # define INLINE_DECL inline /* use C99 inline */ +-# define INLINE_FUN inline ++# define INLINE_FUN static inline + # else + # define INLINE_DECL /* use GNU extern inline */ + # define INLINE_FUN extern inline |