From 6b2b39c0eecce7fd0512ffe1c30266f3640beff1 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Wed, 30 May 2018 22:24:00 +0000 Subject: harmony/gsl: fix license and aarch64 build --- harmony/gsl/APKBUILD | 15 ++++++++------- harmony/gsl/aarch64-test-failure.patch | 13 +++++++++++++ 2 files changed, 21 insertions(+), 7 deletions(-) create mode 100644 harmony/gsl/aarch64-test-failure.patch (limited to 'harmony') diff --git a/harmony/gsl/APKBUILD b/harmony/gsl/APKBUILD index a3f60e348..2820f36d6 100644 --- a/harmony/gsl/APKBUILD +++ b/harmony/gsl/APKBUILD @@ -1,23 +1,23 @@ -# Maintainer: Natanael Copa +# Contributor: Natanael Copa +# Maintainer: A. Wilcox pkgname=gsl pkgver=2.4 -pkgrel=1 +pkgrel=2 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" -license="GPL" +license="GPL-3.0+" depends= makedepends= install= subpackages="$pkgname-dev $pkgname-doc" source="http://ftp.gnu.org/gnu/gsl/gsl-$pkgver.tar.gz - dont-disable-deprecated.patch" + dont-disable-deprecated.patch + aarch64-test-failure.patch" # dont-disable-deprecated.patch is workaround for: # https://github.com/SciRuby/rb-gsl/issues/40 -builddir="$srcdir"/$pkgname-$pkgver - build() { cd "$builddir" ./configure \ @@ -38,4 +38,5 @@ package() { } sha512sums="12442b023dd959e8b22a9c486646b5cedec7fdba0daf2604cda365cf96d10d99aefdec2b42e59c536cc071da1525373454e5ed6f4b15293b305ca9b1dc6db130 gsl-2.4.tar.gz -88d40e599a9e619d8968f9848a91c54492d99032734371ee23072c8dae9d9920da445c1f8a880baa613479facec4afca3d3dec1070c240e5dfd5a662a41c92e8 dont-disable-deprecated.patch" +88d40e599a9e619d8968f9848a91c54492d99032734371ee23072c8dae9d9920da445c1f8a880baa613479facec4afca3d3dec1070c240e5dfd5a662a41c92e8 dont-disable-deprecated.patch +68b685270a377341b3c3ce566ae6eff4ebfc27b75a73f3c7915c57446798bdcca7c1d9f0fa4ce8a50118b371bfe3e2947f9bf33590c86e85db8e807b3b0deae6 aarch64-test-failure.patch" diff --git a/harmony/gsl/aarch64-test-failure.patch b/harmony/gsl/aarch64-test-failure.patch new file mode 100644 index 000000000..0b6e80380 --- /dev/null +++ b/harmony/gsl/aarch64-test-failure.patch @@ -0,0 +1,13 @@ +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); -- cgit v1.2.3-70-g09d2