[sundials] Update to 7.1.1 (#41414)

Co-authored-by: Monica <[email protected]>
chrullrich · Oct 11, 2024 · fea2eca · fea2eca
1 parent f767df2
commit fea2eca
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 18 deletions.
diff --git a/ports/sundials/install-dlls-in-bin.patch b/ports/sundials/install-dlls-in-bin.patch
diff --git a/ports/sundials/portfile.cmake b/ports/sundials/portfile.cmake
@@ -1,20 +1,24 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO LLNL/sundials
-    REF e2f29c34f324829302037a1492db480be8828084
-    SHA512 9af9a5d7a44de1f2afbc35d8e2ec3d35a2d15f1b708be7a90bf849a0d0576fda6c73fae6b8954025805ac1ca25468558c02dcc2fd86b5767699518988817d4d8
+    REF "v${VERSION}"
+    SHA512 1c0448c6fa676364f6ba9c57fe4f96f734247795ae3331fc5f06f9e36c9d2fd92f85d3b126e5f31d8bace767953e2bebc638d31893474943255f1200bb39d065
     HEAD_REF master
-    PATCHES
-        install-dlls-in-bin.patch
 )
 
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" SUN_BUILD_STATIC)
 string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" SUN_BUILD_SHARED)
 
+if(VCPKG_TARGET_IS_ANDROID)
+    set(POSIX_TIMERS "-DSUNDIALS_POSIX_TIMERS=TRUE")
+endif()
+
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
+        ${POSIX_TIMERS}
         -D_BUILD_EXAMPLES=OFF
+        -DSUNDIALS_TEST_UNITTESTS=OFF
         -DBUILD_STATIC_LIBS=${SUN_BUILD_STATIC}
         -DBUILD_SHARED_LIBS=${SUN_BUILD_SHARED}
 )
@@ -23,7 +27,7 @@ vcpkg_cmake_install()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
 file(REMOVE "${CURRENT_PACKAGES_DIR}/LICENSE")
 file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/LICENSE")
 

diff --git a/ports/sundials/vcpkg.json b/ports/sundials/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "sundials",
-  "version-semver": "6.2.0",
+  "version-semver": "7.1.1",
   "description": "SUNDIALS (SUite of Nonlinear and DIfferential/ALgebraic equation Solvers)",
   "homepage": "https://computation.llnl.gov/projects/sundials",
   "dependencies": [

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -8705,7 +8705,7 @@
       "port-version": 2
     },
     "sundials": {
-      "baseline": "6.2.0",
+      "baseline": "7.1.1",
       "port-version": 0
     },
     "superlu": {

diff --git a/versions/s-/sundials.json b/versions/s-/sundials.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "70190bbf1505ebd009d1ac538be87d83798a713e",
+      "version-semver": "7.1.1",
+      "port-version": 0
+    },
     {
       "git-tree": "c95957f06e56f03fb6336a30a984ff7273a36c5a",
       "version-semver": "6.2.0",