3.1.7

4 files changed, 9 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 917e512104f5..1683981ed42e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,17 @@
 pkgbase = cadna_c
 	pkgdesc = Control of Accuracy and Debugging for Numerical Applications
-	pkgver = 3.1.5
+	pkgver = 3.1.7
 	pkgrel = 1
 	url = http://cadna.lip6.fr/
 	arch = i686
 	arch = x86_64
 	license = LGPL
 	depends = gcc-libs
-	depends = openmp
 	depends = openmpi
 	depends = gcc-fortran
 	options = !makeflags
-	source = http://cadna.lip6.fr/Download_Dir/cadna_c-3.1.5.tar.gz
-	source = cxxflags.patch
-	sha256sums = c9d19d820eb4fdfdb412a25d4d7824e6e73cf59e3ee85b273340e557fb86537b
-	sha256sums = 450ee613053d821a14aac5aef3bb0c8a6cef37e21af3f7be153270e3254bb2c9
+	source = http://cadna.lip6.fr/Download_Dir/cadna_c-3.1.7.tar.gz
+	sha256sums = 7013643a33a00bca57043dc5ccd26626cfd04c014e56b835879166d34ff7d180
 
 pkgname = cadna_c
 
diff --git a/.gitignore b/.gitignore
index 69ef300f4dda..62041fe8abaa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 *.tar.xz
+*.tar.zst
 *.tar.gz
 src/
 pkg/
diff --git a/PKGBUILD b/PKGBUILD
index dd712dfa6324..e7d63271bb44 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,19 @@
 pkgname=cadna_c
-pkgver=3.1.5
+pkgver=3.1.7
 pkgrel=1
 pkgdesc="Control of Accuracy and Debugging for Numerical Applications"
 arch=('i686' 'x86_64')
 url="http://cadna.lip6.fr/"
 license=('LGPL')
-depends=('gcc-libs' 'openmp' 'openmpi' 'gcc-fortran')
+depends=('gcc-libs' 'openmpi' 'gcc-fortran')
 makedepends=()
 # README says to not build in parallel (and indeed, parallel build fails)
 options=(!makeflags)
-source=("http://cadna.lip6.fr/Download_Dir/${pkgname}-${pkgver}.tar.gz"
-        "cxxflags.patch")
-sha256sums=('c9d19d820eb4fdfdb412a25d4d7824e6e73cf59e3ee85b273340e557fb86537b'
-            '450ee613053d821a14aac5aef3bb0c8a6cef37e21af3f7be153270e3254bb2c9')
+source=("http://cadna.lip6.fr/Download_Dir/${pkgname}-${pkgver}.tar.gz")
 
 prepare() {
         cd ${pkgname}-${pkgver}
 
-        patch -p1 < ../cxxflags.patch
-
-        # Regen because of patch
-        aclocal
-        automake
-        autoconf
-
         ./configure --prefix=/usr --enable-fortran
 }
 
@@ -104,3 +94,5 @@ package() {
         cd ${pkgname}-${pkgver}
         make install DESTDIR="$pkgdir"
 }
+
+sha256sums=('7013643a33a00bca57043dc5ccd26626cfd04c014e56b835879166d34ff7d180')
diff --git a/cxxflags.patch b/cxxflags.patch
deleted file mode 100644
index cd5702803140..000000000000
--- a/cxxflags.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Fix inconsistent compiler flags: the problem was that only part of the flags
-from makepkg.conf were passed, but _D_FORTIFY_SOURCE flag requires optimization
-flags. This broke detection of OpenMP.
-
-diff -r -C3 a/m4/cadna_check_openmp4.m4 b/m4/cadna_check_openmp4.m4
-*** a/m4/cadna_check_openmp4.m4	2019-12-16 10:58:25.000000000 -0500
---- b/m4/cadna_check_openmp4.m4	2020-02-28 20:42:40.312822803 -0500
-***************
-*** 6,12 ****
-  
-  CADNA_CHECK_OPENMP4_CXXFLAGS="$CXXFLAGS"
-  
-! CXXFLAGS="$AM_CXXFLAGS $OPENMP_CXXFLAGS   -Werror $OPENMP_LDFLAGS "
-  
-  
-  
---- 6,12 ----
-  
-  CADNA_CHECK_OPENMP4_CXXFLAGS="$CXXFLAGS"
-  
-! CXXFLAGS="$CXXFLAGS $AM_CXXFLAGS $OPENMP_CXXFLAGS   -Werror $OPENMP_LDFLAGS "
-  
-  
-  
-diff -r -C3 a/m4/cadna_check_openmp_flags.m4 b/m4/cadna_check_openmp_flags.m4
-*** a/m4/cadna_check_openmp_flags.m4	2019-12-16 10:58:25.000000000 -0500
---- b/m4/cadna_check_openmp_flags.m4	2020-02-28 20:42:40.312822803 -0500
-***************
-*** 5,11 ****
-  
-  CADNA_CHECK_OPENMP_CXXFLAGS="$CXXFLAGS"
-  
-! CXXFLAGS="$AM_CXXFLAGS $OPENMP_CXXFLAGS  -Werror "
-  
-  
-  
---- 5,11 ----
-  
-  CADNA_CHECK_OPENMP_CXXFLAGS="$CXXFLAGS"
-  
-! CXXFLAGS="$CXXFLAGS $AM_CXXFLAGS $OPENMP_CXXFLAGS  -Werror "
-  
-  
-