Date: Friday, January 28, 2022 @ 09:34:43 Author: arojas Revision: 1118231
Fix cmake config again, disable static libs explicitly (FS#73537) Added: sundials/trunk/sundials-fix-cmake-config.patch Modified: sundials/trunk/PKGBUILD ---------------------------------+ PKGBUILD | 14 ++++++++++---- sundials-fix-cmake-config.patch | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-01-28 09:34:42 UTC (rev 1118230) +++ PKGBUILD 2022-01-28 09:34:43 UTC (rev 1118231) @@ -3,7 +3,7 @@ pkgname=sundials pkgver=6.1.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,13 +10,19 @@ license=(BSD) depends=(openmpi suitesparse) makedepends=(cmake gcc-fortran python) -source=(https://github.com/LLNL/sundials/archive/v$pkgver/$pkgname-$pkgver.tar.gz) -sha256sums=('286ac6b3567a8b5c8d372391f9061024dc3c6415556c3eb0423be8bdf2de1e77') +source=(https://github.com/LLNL/sundials/archive/v$pkgver/$pkgname-$pkgver.tar.gz + sundials-fix-cmake-config.patch) +sha256sums=('286ac6b3567a8b5c8d372391f9061024dc3c6415556c3eb0423be8bdf2de1e77' + 'd7a89b080fd0e71eed54e7dcf0f88ba51245aae200ecf685f4c543d47e2e1983') +prepare() { + patch -d $pkgname-$pkgver -p1 < sundials-fix-cmake-config.patch # Fix cmake config +} + build() { cmake -B build -S $pkgname-$pkgver \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_C_FLAGS="${CFLAGS} -fPIC -fcommon" \ + -DBUILD_STATIC_LIBS=OFF \ -DENABLE_MPI=ON \ -DENABLE_PTHREAD=ON \ -DENABLE_OPENMP=ON \ Added: sundials-fix-cmake-config.patch =================================================================== --- sundials-fix-cmake-config.patch (rev 0) +++ sundials-fix-cmake-config.patch 2022-01-28 09:34:43 UTC (rev 1118231) @@ -0,0 +1,14 @@ +diff --git a/cmake/SundialsTPLOptions.cmake b/cmake/SundialsTPLOptions.cmake +index 6445b367..e992035a 100644 +--- a/cmake/SundialsTPLOptions.cmake ++++ b/cmake/SundialsTPLOptions.cmake +@@ -275,8 +275,7 @@ sundials_option(ONEMKL_WORKS BOOL "Set to ON to force CMake to accept a given on + # Enable Caliper support? + # --------------------------------------------------------------- + +-sundials_option(ENABLE_CALIPER BOOL "Enable CALIPER support" OFF +- DEPENDS_ON SUNDIALS_BUILD_WITH_PROFILING) ++sundials_option(ENABLE_CALIPER BOOL "Enable CALIPER support" OFF) + + sundials_option(CALIPER_DIR PATH "Path to the root of an CALIPER installation" "${CALIPER_DIR}" + DEPENDS_ON ENABLE_CALIPER)
