diff options
| author | Ed Robinson <ed.robinson@reevoo.com> | 2017-01-31 16:27:02 +0000 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2017-02-09 06:26:57 +0000 |
| commit | 8c62f44e11e41d5fcdbf3c1a315d34edd5607a78 (patch) | |
| tree | f48d853fc00ceda240059e62a75fd02c47ab00f2 | |
| parent | 06f7af414b6cac92706790547c5c98838e229f0f (diff) | |
| download | aports-8c62f44e11e41d5fcdbf3c1a315d34edd5607a78.tar.bz2 aports-8c62f44e11e41d5fcdbf3c1a315d34edd5607a78.tar.xz | |
main/gsl: don't disable deprecated symbols
| -rw-r--r-- | main/gsl/APKBUILD | 27 | ||||
| -rw-r--r-- | main/gsl/dont-disable-deprecated.patch | 24 |
2 files changed, 40 insertions, 11 deletions
diff --git a/main/gsl/APKBUILD b/main/gsl/APKBUILD index 04101b9679..3da5efc2b4 100644 --- a/main/gsl/APKBUILD +++ b/main/gsl/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=gsl pkgver=2.2.1 -pkgrel=0 +pkgrel=1 pkgdesc="The GNU Scientific Library (GSL) is a modern numerical library for C and C++ programmers" url="http://www.gnu.org/software/gsl/gsl.html" arch="all" @@ -10,15 +10,16 @@ depends= makedepends= install= subpackages="$pkgname-dev $pkgname-doc" -source="http://ftp.gnu.org/gnu/gsl/gsl-$pkgver.tar.gz" +source="http://ftp.gnu.org/gnu/gsl/gsl-$pkgver.tar.gz + dont-disable-deprecated.patch" -_builddir="$srcdir"/$pkgname-$pkgver +# dont-disable-deprecated.patch is workaround for: +# https://github.com/SciRuby/rb-gsl/issues/40 + +builddir="$srcdir"/$pkgname-$pkgver -prepare() { - cd "$_builddir" -} build() { - cd "$_builddir" + cd "$builddir" ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -28,9 +29,13 @@ build() { } package() { - cd "$_builddir" + cd "$builddir" make DESTDIR="$pkgdir" install || return 1 } -md5sums="3d90650b7cfe0a6f4b29c2d7b0f86458 gsl-2.2.1.tar.gz" -sha256sums="13d23dc7b0824e1405f3f7e7d0776deee9b8f62c62860bf66e7852d402b8b024 gsl-2.2.1.tar.gz" -sha512sums="834210d91db6bc4be1df0c0be8e66af16bdf607bfc9d9d33bc240c428e3452e60bdab92240b88dcb15f24171be541e1fafa18368c7a257a44241e568c1c11942 gsl-2.2.1.tar.gz" + +md5sums="3d90650b7cfe0a6f4b29c2d7b0f86458 gsl-2.2.1.tar.gz +293cf2947f41453e3b46bd5392a58b4a dont-disable-deprecated.patch" +sha256sums="13d23dc7b0824e1405f3f7e7d0776deee9b8f62c62860bf66e7852d402b8b024 gsl-2.2.1.tar.gz +a7b4689dfb36546723df50c7ced5117c42eb86bfbee1693818b7d96632680529 dont-disable-deprecated.patch" +sha512sums="834210d91db6bc4be1df0c0be8e66af16bdf607bfc9d9d33bc240c428e3452e60bdab92240b88dcb15f24171be541e1fafa18368c7a257a44241e568c1c11942 gsl-2.2.1.tar.gz +88d40e599a9e619d8968f9848a91c54492d99032734371ee23072c8dae9d9920da445c1f8a880baa613479facec4afca3d3dec1070c240e5dfd5a662a41c92e8 dont-disable-deprecated.patch" diff --git a/main/gsl/dont-disable-deprecated.patch b/main/gsl/dont-disable-deprecated.patch new file mode 100644 index 0000000000..40a7c3bcee --- /dev/null +++ b/main/gsl/dont-disable-deprecated.patch @@ -0,0 +1,24 @@ +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 |