diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-07-29 03:13:16 -0500 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2018-07-29 03:13:16 -0500 |
| commit | cf4e117cdbf94bf75339cd49de4161a8c6189bbc (patch) | |
| tree | 144c4a3dbd2af461f394ba20570f6282a408c6f5 | |
| parent | ef4856fa4a5438cec920bdea96e1392db27a5716 (diff) | |
| download | packages-cf4e117cdbf94bf75339cd49de4161a8c6189bbc.tar.gz packages-cf4e117cdbf94bf75339cd49de4161a8c6189bbc.tar.bz2 packages-cf4e117cdbf94bf75339cd49de4161a8c6189bbc.tar.xz packages-cf4e117cdbf94bf75339cd49de4161a8c6189bbc.zip | |
user/gsl: re-establish portability, fix PPC32 build
| -rw-r--r-- | user/gsl/APKBUILD | 10 | ||||
| -rw-r--r-- | user/gsl/gsl-2.4-portable.patch | 24 |
2 files changed, 31 insertions, 3 deletions
diff --git a/user/gsl/APKBUILD b/user/gsl/APKBUILD index a659738f7..4d2a5d929 100644 --- a/user/gsl/APKBUILD +++ b/user/gsl/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gsl pkgver=2.5 -pkgrel=0 +pkgrel=1 pkgdesc="Modern numerical library for C and C++" url="https://www.gnu.org/software/gsl/gsl.html" arch="all" @@ -12,13 +12,16 @@ 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" + aarch64-test-failure.patch + gsl-2.4-portable.patch + " # dont-disable-deprecated.patch is workaround for: # https://github.com/SciRuby/rb-gsl/issues/40 build() { cd "$builddir" + [ $CTARGET_ARCH != "ppc" ] || export ac_cv_c_ieee_interface=unknown ./configure \ --build=$CBUILD \ --host=$CHOST \ @@ -38,4 +41,5 @@ package() { sha512sums="5b4c5c023f9029ce220f4e09aa4d0234fed94d42ac224d58fda095fe0532d54237a7c33278f8b5d0ba051f6004486edb38d0adb4fcb49337a8c1d8a18cf4a24a gsl-2.5.tar.gz 88d40e599a9e619d8968f9848a91c54492d99032734371ee23072c8dae9d9920da445c1f8a880baa613479facec4afca3d3dec1070c240e5dfd5a662a41c92e8 dont-disable-deprecated.patch -68b685270a377341b3c3ce566ae6eff4ebfc27b75a73f3c7915c57446798bdcca7c1d9f0fa4ce8a50118b371bfe3e2947f9bf33590c86e85db8e807b3b0deae6 aarch64-test-failure.patch" +68b685270a377341b3c3ce566ae6eff4ebfc27b75a73f3c7915c57446798bdcca7c1d9f0fa4ce8a50118b371bfe3e2947f9bf33590c86e85db8e807b3b0deae6 aarch64-test-failure.patch +f6a22e82c8f4a1d5ea7b647cbd015cdb9d2e4e9d39728e8f2dba3fdefac64d3f7c8fbc5ec597e6ab315ec1bd49e0e3af4aba091b358a68d9d789884331f4be24 gsl-2.4-portable.patch" diff --git a/user/gsl/gsl-2.4-portable.patch b/user/gsl/gsl-2.4-portable.patch new file mode 100644 index 000000000..13bf42a93 --- /dev/null +++ b/user/gsl/gsl-2.4-portable.patch @@ -0,0 +1,24 @@ +Based on the FreeBSD patch that brings the generic C99 interface to all +architectures, this patch makes sure that "special" arch code isn't used. + +--- gsl-2.4/ieee-utils/fp.c 2015-11-03 10:21:55.000000000 -0600 ++++ gsl-2.4/ieee-utils/fp.c 2018-04-24 22:45:00.934921840 -0500 +@@ -1,6 +1,8 @@ + #include <config.h> + +-#if HAVE_GNUSPARC_IEEE_INTERFACE ++#if HAVE_DECL_FEENABLEEXCEPT || HAVE_DECL_FESETTRAPENABLE ++#include "fp-gnuc99.c" ++#elif HAVE_GNUSPARC_IEEE_INTERFACE + #include "fp-gnusparc.c" + #elif HAVE_GNUM68K_IEEE_INTERFACE + #include "fp-gnum68k.c" +@@ -43,8 +45,6 @@ + # else + # include "fp-darwin86.c" + #endif +-#elif HAVE_DECL_FEENABLEEXCEPT || HAVE_DECL_FESETTRAPENABLE +-#include "fp-gnuc99.c" + #else + #include "fp-unknown.c" + #endif |