From cfbefb1408bd0b17b51bed1125959b5943e08003 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Mon, 15 Oct 2018 21:43:25 +0000 Subject: user/eigen: fix build of user/step with -Werror=no-return --- user/eigen/APKBUILD | 9 ++++++--- user/eigen/prototype.patch | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 user/eigen/prototype.patch (limited to 'user') diff --git a/user/eigen/APKBUILD b/user/eigen/APKBUILD index a262b40b7..9dcef042e 100644 --- a/user/eigen/APKBUILD +++ b/user/eigen/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: pkgname=eigen pkgver=3.3.5 -pkgrel=0 +pkgrel=1 pkgdesc="Eigen is a C++ template library for linear algebra" url="http://eigen.tuxfamily.org/index.php?title=Main_Page" arch="noarch" @@ -11,7 +11,9 @@ license="MPL-2.0" depends="" makedepends="" subpackages="$pkgname-dev" -source="$pkgname-$pkgver.tar.gz::http://bitbucket.org/eigen/$pkgname/get/$pkgver.tar.gz" +source="$pkgname-$pkgver.tar.gz::http://bitbucket.org/eigen/$pkgname/get/$pkgver.tar.gz + prototype.patch + " prepare() { mv "$srcdir"/eigen-eigen-* "$builddir" # directory name contains hash @@ -24,4 +26,5 @@ package() { cp -r "$builddir"/unsupported "$pkgdir"/usr/include/eigen3 } -sha512sums="32398be114924ed10ea063bc2b857176bf28b3d5fb915344e972765e3f72e7b72f4a4cee1742e70029e391fdd06f854aa2ab1613b107bd41fbfaf32f0c44463e eigen-3.3.5.tar.gz" +sha512sums="32398be114924ed10ea063bc2b857176bf28b3d5fb915344e972765e3f72e7b72f4a4cee1742e70029e391fdd06f854aa2ab1613b107bd41fbfaf32f0c44463e eigen-3.3.5.tar.gz +bbecc8323dbbd37b624ae8816ce9c3ee3f1791b10847f5d56a957d00197fd13ff5cc2026b2eb644d5eb0f77f74fc20b25f98070befbd1c2dfd98e9c596778942 prototype.patch" diff --git a/user/eigen/prototype.patch b/user/eigen/prototype.patch new file mode 100644 index 000000000..d1205b7dd --- /dev/null +++ b/user/eigen/prototype.patch @@ -0,0 +1,22 @@ +From fc10b565bf15aa3438d3586e759ea88a8091411d Mon Sep 17 00:00:00 2001 +From: Gael Guennebaud +Date: Fri, 8 Jun 2018 09:56:01 +0200 +Subject: [PATCH] fix prototype + +--- + unsupported/Eigen/src/IterativeSolvers/DGMRES.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/unsupported/Eigen/src/IterativeSolvers/DGMRES.h b/unsupported/Eigen/src/IterativeSolvers/DGMRES.h +index f40b80eda..be039e07f 100644 +--- a/unsupported/Eigen/src/IterativeSolvers/DGMRES.h ++++ b/unsupported/Eigen/src/IterativeSolvers/DGMRES.h +@@ -173,7 +173,7 @@ class DGMRES : public IterativeSolverBase > + /** + * Set the restart value (default is 30) + */ +- Index set_restart(const Index restart) { m_restart=restart; } ++ void set_restart(const Index restart) { m_restart=restart; } + + /** + * Set the number of eigenvalues to deflate at each restart -- cgit v1.2.3-60-g2f50