Date: Saturday, December 25, 2021 @ 14:58:16 Author: arojas Revision: 1083680
Really fix cmake config (FS#73143) Added: sundials/trunk/sundials-fix-cmake-config.patch Modified: sundials/trunk/PKGBUILD ---------------------------------+ PKGBUILD | 10 ++++++---- sundials-fix-cmake-config.patch | 14 ++++++++++++++ 2 files changed, 20 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-12-25 14:19:11 UTC (rev 1083679) +++ PKGBUILD 2021-12-25 14:58:16 UTC (rev 1083680) @@ -3,7 +3,7 @@ pkgname=sundials pkgver=6.0.0 -pkgrel=2 +pkgrel=3 pkgdesc='Suite of nonlinear differential/algebraic equation solvers' arch=(x86_64) url='https://computation.llnl.gov/casc/sundials/main.html' @@ -11,13 +11,15 @@ 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-targets.patch + sundials-fix-cmake-config.patch) sha256sums=('c7178e54df20a9363ae3e5ac5b3ee9db756a4ddd4b8fff045127e93b73b151f4' - '949206b3237fb918700c87664da5618de49fe019f342583e560e4ce63ebe3a61') + '949206b3237fb918700c87664da5618de49fe019f342583e560e4ce63ebe3a61' + '89ba61913fd1a66a135a5bdaa7cf851af2f3badb84cf2de20522da549fb30294') 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 + patch -d $pkgname-$pkgver -p1 < sundials-fix-cmake-config.patch # FS#73143 } build() { Added: sundials-fix-cmake-config.patch =================================================================== --- sundials-fix-cmake-config.patch (rev 0) +++ sundials-fix-cmake-config.patch 2021-12-25 14:58:16 UTC (rev 1083680) @@ -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)
