Skip to content

Commit 8c62f44

Browse files
errmfabled
authored andcommitted
main/gsl: don't disable deprecated symbols
1 parent 06f7af4 commit 8c62f44

File tree

2 files changed

+40
-11
lines changed

2 files changed

+40
-11
lines changed

main/gsl/APKBUILD

+16-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Maintainer: Natanael Copa <[email protected]>
22
pkgname=gsl
33
pkgver=2.2.1
4-
pkgrel=0
4+
pkgrel=1
55
pkgdesc="The GNU Scientific Library (GSL) is a modern numerical library for C and C++ programmers"
66
url="http://www.gnu.org/software/gsl/gsl.html"
77
arch="all"
@@ -10,15 +10,16 @@ depends=
1010
makedepends=
1111
install=
1212
subpackages="$pkgname-dev $pkgname-doc"
13-
source="http://ftp.gnu.org/gnu/gsl/gsl-$pkgver.tar.gz"
13+
source="http://ftp.gnu.org/gnu/gsl/gsl-$pkgver.tar.gz
14+
dont-disable-deprecated.patch"
1415

15-
_builddir="$srcdir"/$pkgname-$pkgver
16+
# dont-disable-deprecated.patch is workaround for:
17+
# https://github.com/SciRuby/rb-gsl/issues/40
18+
19+
builddir="$srcdir"/$pkgname-$pkgver
1620

17-
prepare() {
18-
cd "$_builddir"
19-
}
2021
build() {
21-
cd "$_builddir"
22+
cd "$builddir"
2223
./configure \
2324
--build=$CBUILD \
2425
--host=$CHOST \
@@ -28,9 +29,13 @@ build() {
2829
}
2930

3031
package() {
31-
cd "$_builddir"
32+
cd "$builddir"
3233
make DESTDIR="$pkgdir" install || return 1
3334
}
34-
md5sums="3d90650b7cfe0a6f4b29c2d7b0f86458 gsl-2.2.1.tar.gz"
35-
sha256sums="13d23dc7b0824e1405f3f7e7d0776deee9b8f62c62860bf66e7852d402b8b024 gsl-2.2.1.tar.gz"
36-
sha512sums="834210d91db6bc4be1df0c0be8e66af16bdf607bfc9d9d33bc240c428e3452e60bdab92240b88dcb15f24171be541e1fafa18368c7a257a44241e568c1c11942 gsl-2.2.1.tar.gz"
35+
36+
md5sums="3d90650b7cfe0a6f4b29c2d7b0f86458 gsl-2.2.1.tar.gz
37+
293cf2947f41453e3b46bd5392a58b4a dont-disable-deprecated.patch"
38+
sha256sums="13d23dc7b0824e1405f3f7e7d0776deee9b8f62c62860bf66e7852d402b8b024 gsl-2.2.1.tar.gz
39+
a7b4689dfb36546723df50c7ced5117c42eb86bfbee1693818b7d96632680529 dont-disable-deprecated.patch"
40+
sha512sums="834210d91db6bc4be1df0c0be8e66af16bdf607bfc9d9d33bc240c428e3452e60bdab92240b88dcb15f24171be541e1fafa18368c7a257a44241e568c1c11942 gsl-2.2.1.tar.gz
41+
88d40e599a9e619d8968f9848a91c54492d99032734371ee23072c8dae9d9920da445c1f8a880baa613479facec4afca3d3dec1070c240e5dfd5a662a41c92e8 dont-disable-deprecated.patch"
+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
diff -urp gsl-2.2.1/configure.ac patched/configure.ac
2+
--- gsl-2.2.1/configure.ac 2016-08-31 15:54:07.000000000 +0100
3+
+++ patched/configure.ac 2017-01-31 14:52:10.000000000 +0000
4+
@@ -575,10 +575,6 @@ AH_BOTTOM([#if defined(GSL_RANGE_CHECK_O
5+
AH_BOTTOM([#define RETURN_IF_NULL(x) if (!x) { return ; }
6+
])
7+
8+
-AH_VERBATIM([GSL_DISABLE_DEPRECATED],
9+
-[/* Disable deprecated functions and enums while building */
10+
-#define GSL_DISABLE_DEPRECATED 1])
11+
-
12+
dnl
13+
AC_CONFIG_FILES([ \
14+
Makefile \
15+
--- gsl-2.2.1/config.h.in 2016-08-31 15:54:51.000000000 +0100
16+
+++ patched/config.h.in 2017-01-31 16:01:17.000000000 +0000
17+
@@ -1,8 +1,5 @@
18+
/* config.h.in. Generated from configure.ac by autoheader. */
19+
20+
-/* Disable deprecated functions and enums while building */
21+
-#define GSL_DISABLE_DEPRECATED 1
22+
-
23+
/* Define if you have inline with C99 behavior */
24+
#undef HAVE_C99_INLINE

0 commit comments

Comments
 (0)