<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4f3cde541fd5692594d23dc9209d582987dfe0d7">https://github.com/macports/macports-ports/commit/4f3cde541fd5692594d23dc9209d582987dfe0d7</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 4f3cde541fd libKriging: update to 0.8.3
</span>4f3cde541fd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4f3cde541fd5692594d23dc9209d582987dfe0d7
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Mon Dec 25 07:32:32 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> libKriging: update to 0.8.3
</span>---
math/libKriging/Portfile | 6 ++----
math/libKriging/files/patch-CMakeLists.diff | 32 +++++++++++------------------
2 files changed, 14 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/libKriging/Portfile b/math/libKriging/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9adf3e09214..2923f2919c1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/libKriging/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/libKriging/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,10 +5,8 @@ PortGroup cmake 1.1
</span> PortGroup compilers 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# 0.8.0 vanished, which has broken git fetch: https://github.com/libKriging/libKriging/issues/274
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup libKriging libKriging 15cb21ffff83d4796b794ae3daa3864f8a383767
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 0.8.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup libKriging libKriging 0.8.3 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories math
license Apache-2
maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/libKriging/files/patch-CMakeLists.diff b/math/libKriging/files/patch-CMakeLists.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index de08470227a..e8dc187cd4a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/libKriging/files/patch-CMakeLists.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/libKriging/files/patch-CMakeLists.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2023-07-07 00:43:01.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2023-12-01 15:30:05
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -168,11 +168,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Dependencies
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(DETECT_HDF5 true CACHE BOOL "Disable HDF5 to avoid conflict with armadillo") # prevent issue #40
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2023-12-25 07:07:51.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-12-25 07:15:27.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -169,9 +169,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(DETECT_HDF5 false CACHE BOOL "Disable HDF5 to avoid conflict with armadillo") # prevent issue #40
</span> set(CMAKE_POLICY_DEFAULT_CMP0048 NEW) # disable warning about missing version in project command
<span style='display:block; white-space:pre;background:#ffe0e0;'>--set(BUILD_SMOKE_TEST OFF CACHE BOOL "armadillo smoke test") # no smoke tests: it fails due to custom memory guard in memory.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(BUILD_SMOKE_TEST OFF CACHE BOOL "armadillo smoke test") # no smoke tests: it fails due to custom memory guard in memory.hpp
</span> -add_subdirectory(dependencies/armadillo-code)
-include_directories(SYSTEM dependencies/armadillo-code/include)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+set(BUILD_SMOKE_TEST OFF CACHE BOOL "armadillo smoke test") # no smoke tests: it fails due to custom memory guard in memory.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# Do not build a duplicate.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# add_subdirectory(dependencies/armadillo-code)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include_directories(SYSTEM dependencies/armadillo-code/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> -add_library(blas ALIAS armadillo) # to use armadillo blas inside lbfgsb_cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+# add_library(blas ALIAS armadillo) # to use armadillo blas inside lbfgsb_cpp
</span>
set(ignoreUnusedVariable ${LBFGSB_SHOW_BUILD})
<span style='display:block; white-space:pre;background:#ffe0e0;'>- message(STATUS "Compiling lbfgsb_cpp as an external library")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -226,9 +227,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_subdirectory(dependencies/lbfgsb_cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -219,9 +216,8 @@
</span> #------------------------------------------------------
# Required since RcppArmadillo uses it by default
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,7 +22,7 @@
</span> add_definitions(-DARMA_ALIEN_MEM_ALLOC_FUNCTION=lkalloc::malloc)
add_definitions(-DARMA_ALIEN_MEM_FREE_FUNCTION=lkalloc::free)
add_definitions(-DCARMA_DO_NOT_EXPORT_ALIEN_MEM_FUNCTIONS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -705,7 +705,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -698,7 +694,7 @@
</span> ${CMAKE_COMMAND}
-DBUILD_TYPE=${CMAKE_BUILD_TYPE}
-P ${CMAKE_BINARY_DIR}/cmake_install.cmake)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,19 +32,18 @@
</span> ADD_DEPENDENCIES(install.lib _pylibkriging)
endif()
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/lib/CMakeLists.txt.orig 2023-07-07 00:43:01.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/lib/CMakeLists.txt 2023-07-07 04:10:34.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,7 +33,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/lib/CMakeLists.txt.orig 2023-12-25 07:07:51.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/lib/CMakeLists.txt 2023-12-25 07:12:06.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,7 +34,7 @@
</span> CXX_CLANG_TIDY ${CXX_CLANG_TIDY})
endif ()
<span style='display:block; white-space:pre;background:#ffe0e0;'>--target_link_libraries(Kriging PUBLIC armadillo lbfgsb_cpp::lbfgsb_cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_link_libraries(Kriging PUBLIC armadillo lbfgsb_cpp::lbfgsb_cpp) # maybe PRIVATE
</span> +target_link_libraries(Kriging PUBLIC armadillo hdf5 lbfgsb_cpp::lbfgsb_cpp)
# TODO check if this method is useful
# * https://atomheartother.github.io/c++/2018/07/12/CPPDynLib.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> --- dependencies/lbfgsb_cpp/cmake/ExternalFortranProject.cmake.in.orig 2023-07-07 00:43:34.000000000 +0800
+++ dependencies/lbfgsb_cpp/cmake/ExternalFortranProject.cmake.in 2023-07-07 06:08:25.000000000 +0800
@@ -3,7 +3,6 @@
</pre><pre style='margin:0'>
</pre>