[arch-commits] Commit in sundials/repos/community-x86_64 (5 files)
Antonio Rojas
arojas at gemini.archlinux.org
Sat Dec 25 14:58:39 UTC 2021
Date: Saturday, December 25, 2021 @ 14:58:39
Author: arojas
Revision: 1083681
archrelease: copy trunk to community-x86_64
Added:
sundials/repos/community-x86_64/PKGBUILD
(from rev 1083680, sundials/trunk/PKGBUILD)
sundials/repos/community-x86_64/sundials-fix-cmake-config.patch
(from rev 1083680, sundials/trunk/sundials-fix-cmake-config.patch)
sundials/repos/community-x86_64/sundials-fix-cmake-targets.patch
(from rev 1083680, sundials/trunk/sundials-fix-cmake-targets.patch)
Deleted:
sundials/repos/community-x86_64/PKGBUILD
sundials/repos/community-x86_64/sundials-fix-cmake-targets.patch
----------------------------------+
PKGBUILD | 84 ++++++++++++++++++-------------------
sundials-fix-cmake-config.patch | 14 ++++++
sundials-fix-cmake-targets.patch | 26 +++++------
3 files changed, 70 insertions(+), 54 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-12-25 14:58:16 UTC (rev 1083680)
+++ PKGBUILD 2021-12-25 14:58:39 UTC (rev 1083681)
@@ -1,41 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# Contributor: Elmar Klausmeier <Elmar.Klausmeier at gmail.com>
-
-pkgname=sundials
-pkgver=6.0.0
-pkgrel=2
-pkgdesc='Suite of nonlinear differential/algebraic equation solvers'
-arch=(x86_64)
-url='https://computation.llnl.gov/casc/sundials/main.html'
-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)
-sha256sums=('c7178e54df20a9363ae3e5ac5b3ee9db756a4ddd4b8fff045127e93b73b151f4'
- '949206b3237fb918700c87664da5618de49fe019f342583e560e4ce63ebe3a61')
-
-prepare() {
- patch -d $pkgname-$pkgver -p1 < sundials-fix-cmake-targets.patch # FS#70399
- sed -e '/SHOW_IF SUNDIALS_BUILD_WITH_PROFILING/d' -i $pkgname-$pkgver/cmake/SundialsTPLOptions.cmake # Workaround broken cmake config
-}
-
-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 \
- -DENABLE_KLU=ON \
- -DKLU_LIBRARY_DIR=/usr/lib \
- -DEXAMPLES_INSTALL_PATH=/usr/share/sundials/examples
- cmake --build build
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
-
- install -Dm644 $pkgname-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
-}
Copied: sundials/repos/community-x86_64/PKGBUILD (from rev 1083680, sundials/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-12-25 14:58:39 UTC (rev 1083681)
@@ -0,0 +1,43 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# Contributor: Elmar Klausmeier <Elmar.Klausmeier at gmail.com>
+
+pkgname=sundials
+pkgver=6.0.0
+pkgrel=3
+pkgdesc='Suite of nonlinear differential/algebraic equation solvers'
+arch=(x86_64)
+url='https://computation.llnl.gov/casc/sundials/main.html'
+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')
+
+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 \
+ -DENABLE_KLU=ON \
+ -DKLU_LIBRARY_DIR=/usr/lib \
+ -DEXAMPLES_INSTALL_PATH=/usr/share/sundials/examples
+ cmake --build build
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+
+ install -Dm644 $pkgname-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
+}
Copied: sundials/repos/community-x86_64/sundials-fix-cmake-config.patch (from rev 1083680, sundials/trunk/sundials-fix-cmake-config.patch)
===================================================================
--- sundials-fix-cmake-config.patch (rev 0)
+++ sundials-fix-cmake-config.patch 2021-12-25 14:58:39 UTC (rev 1083681)
@@ -0,0 +1,14 @@
+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 2021-12-25 14:58:16 UTC (rev 1083680)
+++ sundials-fix-cmake-targets.patch 2021-12-25 14:58:39 UTC (rev 1083681)
@@ -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()
-
Copied: sundials/repos/community-x86_64/sundials-fix-cmake-targets.patch (from rev 1083680, sundials/trunk/sundials-fix-cmake-targets.patch)
===================================================================
--- sundials-fix-cmake-targets.patch (rev 0)
+++ sundials-fix-cmake-targets.patch 2021-12-25 14:58:39 UTC (rev 1083681)
@@ -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()
+
More information about the arch-commits
mailing list