[arch-commits] Commit in sundials/trunk (PKGBUILD sundials-fix-cmake-targets.patch)

[Antonio Rojas]

    Date: Saturday, April 10, 2021 @ 18:29:24
  Author: arojas
Revision: 915603

Don't add cmake targets for static libraries with a shared counterpart (FS#70399)

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

----------------------------------+
 PKGBUILD                         |   12 +++++++++---
 sundials-fix-cmake-targets.patch |   13 +++++++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-04-10 18:10:53 UTC (rev 915602)
+++ PKGBUILD	2021-04-10 18:29:24 UTC (rev 915603)
@@ -3,7 +3,7 @@
 
 pkgname=sundials
 pkgver=5.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Suite of nonlinear differential/algebraic equation solvers"
 arch=(x86_64)
 url="https://computation.llnl.gov/casc/sundials/main.html"
@@ -10,9 +10,15 @@
 license=(BSD)
 depends=(openmpi suitesparse)
 makedepends=(cmake gcc-fortran python)
-source=("https://computation.llnl.gov/projects/sundials/download/$pkgname-$pkgver.tar.gz")
-sha256sums=('8d6dd094feccbb8d6ecc41340ec16a65fabac82ed4415023f6d7c1c2390ea2f3')
+source=(https://computation.llnl.gov/projects/sundials/download/$pkgname-$pkgver.tar.gz
+        sundials-fix-cmake-targets.patch)
+sha256sums=('8d6dd094feccbb8d6ecc41340ec16a65fabac82ed4415023f6d7c1c2390ea2f3'
+            '949206b3237fb918700c87664da5618de49fe019f342583e560e4ce63ebe3a61')
 
+prepare() {
+  patch -d $pkgname-$pkgver -p1 < sundials-fix-cmake-targets.patch # FS#70399
+}
+
 build() {
   cmake -B build -S $pkgname-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \

Added: sundials-fix-cmake-targets.patch
===================================================================
--- sundials-fix-cmake-targets.patch	                        (rev 0)
+++ sundials-fix-cmake-targets.patch	2021-04-10 18:29:24 UTC (rev 915603)
@@ -0,0 +1,13 @@
+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()
+