[arch-commits] Commit in sundials/trunk (3 files)

[Antonio Rojas]

    Date: Wednesday, January 12, 2022 @ 20:46:23
  Author: arojas
Revision: 1101744

Update to 6.1.0

Modified:
  sundials/trunk/PKGBUILD
Deleted:
  sundials/trunk/sundials-fix-cmake-config.patch
  sundials/trunk/sundials-fix-cmake-targets.patch

----------------------------------+
 PKGBUILD                         |   18 ++++--------------
 sundials-fix-cmake-config.patch  |   14 --------------
 sundials-fix-cmake-targets.patch |   13 -------------
 3 files changed, 4 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-12 20:42:49 UTC (rev 1101743)
+++ PKGBUILD	2022-01-12 20:46:23 UTC (rev 1101744)
@@ -2,8 +2,8 @@
 # Contributor: Elmar Klausmeier <Elmar.Klausmeier at gmail.com>
 
 pkgname=sundials
-pkgver=6.0.0
-pkgrel=3
+pkgver=6.1.0
+pkgrel=1
 pkgdesc='Suite of nonlinear differential/algebraic equation solvers'
 arch=(x86_64)
 url='https://computation.llnl.gov/casc/sundials/main.html'
@@ -10,23 +10,13 @@
 license=(BSD)
 depends=(openmpi suitesparse)
 makedepends=(cmake gcc-fortran python)
-source=(https://github.com/LLNL/sundials/releases/download/v$pkgver/$pkgname-$pkgver.tar.gz
-        sundials-fix-cmake-targets.patch
-        sundials-fix-cmake-config.patch)
-sha256sums=('c7178e54df20a9363ae3e5ac5b3ee9db756a4ddd4b8fff045127e93b73b151f4'
-            '949206b3237fb918700c87664da5618de49fe019f342583e560e4ce63ebe3a61'
-            '89ba61913fd1a66a135a5bdaa7cf851af2f3badb84cf2de20522da549fb30294')
+source=(https://github.com/LLNL/sundials/archive/v$pkgver/$pkgname-$pkgver.tar.gz)
+sha256sums=('286ac6b3567a8b5c8d372391f9061024dc3c6415556c3eb0423be8bdf2de1e77')
 
-prepare() {
-  patch -d $pkgname-$pkgver -p1 < sundials-fix-cmake-targets.patch # FS#70399
-  patch -d $pkgname-$pkgver -p1 < sundials-fix-cmake-config.patch # FS#73143
-}
-
 build() {
   cmake -B build -S $pkgname-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_C_FLAGS="${CFLAGS} -fPIC -fcommon" \
-    -DCMAKE_C_STANDARD=11 \
     -DENABLE_MPI=ON \
     -DENABLE_PTHREAD=ON	\
     -DENABLE_OPENMP=ON \

Deleted: sundials-fix-cmake-config.patch
===================================================================
--- sundials-fix-cmake-config.patch	2022-01-12 20:42:49 UTC (rev 1101743)
+++ sundials-fix-cmake-config.patch	2022-01-12 20:46:23 UTC (rev 1101744)
@@ -1,14 +0,0 @@
-diff --git a/cmake/SundialsTPLOptions.cmake b/cmake/SundialsTPLOptions.cmake
-index cc3e9a7..5cd2fea 100644
---- a/cmake/SundialsTPLOptions.cmake
-+++ b/cmake/SundialsTPLOptions.cmake
-@@ -273,8 +273,7 @@ sundials_option(ONEMKL_WORKS BOOL "Set to ON to force CMake to accept a given on
- # ---------------------------------------------------------------
- 
- sundials_option(ENABLE_CALIPER BOOL "Enable CALIPER support" OFF
--                SHOW_IF SUNDIALS_BUILD_WITH_PROFILING
--                DEPENDS_ON SUNDIALS_BUILD_WITH_PROFILING)
-+                SHOW_IF SUNDIALS_BUILD_WITH_PROFILING)
- 
- sundials_option(CALIPER_DIR PATH "Path to the root of an CALIPER installation" "${CALIPER_DIR}"
-                 DEPENDS_ON ENABLE_CALIPER)

Deleted: sundials-fix-cmake-targets.patch
===================================================================
--- sundials-fix-cmake-targets.patch	2022-01-12 20:42:49 UTC (rev 1101743)
+++ sundials-fix-cmake-targets.patch	2022-01-12 20:46:23 UTC (rev 1101744)
@@ -1,13 +0,0 @@
-diff --git a/cmake/macros/SundialsAddLibrary.cmake b/cmake/macros/SundialsAddLibrary.cmake
-index 1d78918..5acd856 100644
---- a/cmake/macros/SundialsAddLibrary.cmake
-+++ b/cmake/macros/SundialsAddLibrary.cmake
-@@ -122,7 +122,7 @@ macro(sundials_add_library target)
- 
-   # library types to create
-   set(_libtypes "")
--  if(BUILD_STATIC_LIBS AND (NOT sundials_add_library_SHARED_ONLY))
-+  if(BUILD_STATIC_LIBS AND sundials_add_library_STATIC_ONLY)
-     set(_libtypes "STATIC")
-   endif()
-