<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/ad65e961296cbed7c88653bf0fd8d4311c505331">https://github.com/macports/macports-ports/commit/ad65e961296cbed7c88653bf0fd8d4311c505331</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 ad65e961296 libKriging: new port in math
</span>ad65e961296 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit ad65e961296cbed7c88653bf0fd8d4311c505331
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Fri Jul 7 06:32:48 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> libKriging: new port in math
</span>---
math/libKriging/Portfile | 54 ++++++++++++++
math/libKriging/files/patch-CMakeLists.diff | 105 ++++++++++++++++++++++++++++
2 files changed, 159 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/libKriging/Portfile b/math/libKriging/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..24099a11a4e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/libKriging/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,54 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compilers 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup libKriging libKriging 0.8.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories math
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license Apache-2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {@barracuda156 gmail.com:vital.had} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description Kriging library for performance and wide language support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+fetch.type git
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-fetch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "git submodule update --init"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.build_type MinSizeRel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compilers.choose cc cxx fc f90
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compilers.setup require_fortran -g95
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-CMakeLists.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,__FC__,${configure.fc}," ${worksrcpath}/CMakeLists.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/dependencies/lbfgsb_cpp/CMakeLists.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/dependencies/lbfgsb_cpp/cmake/ExternalFortranProject.cmake.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:armadillo \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hdf5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Yes, explicitly passing Fortran_COMPILER is needed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_Fortran_COMPILER=${configure.fc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_SHARED_LIBS=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Automatic installation fails, since the build system magically pulls out Armadillo duplicates.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.pre_args-replace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_BUILD_WITH_INSTALL_RPATH:BOOL=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.run yes
</span><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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f8e6fcf1e79
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</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;'>@@ -0,0 +1,105 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2023-07-07 00:43:01.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-07-07 06:17:10.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -168,17 +168,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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;'>+ set(CMAKE_POLICY_DEFAULT_CMP0048 NEW) # disable warning about missing version in project command
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+-add_subdirectory(dependencies/armadillo-code)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-include_directories(SYSTEM dependencies/armadillo-code/include)
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>++# Do not build a duplicate.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# add_subdirectory(dependencies/armadillo-code)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# include_directories(SYSTEM dependencies/armadillo-code/include)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-add_library(blas ALIAS armadillo) # to use armadillo blas inside lbfgsb_cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# add_library(blas ALIAS armadillo) # to use armadillo blas inside lbfgsb_cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (NOT CMAKE_Fortran_COMPILER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_Fortran_COMPILER gfortran)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_Fortran_COMPILER __FC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (NOT Fortran_LINK_FLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(Fortran_LINK_FLAGS "-lgfortran -lquadmath -lm")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Unbreak PPC build:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(CMAKE_OSX_ARCHITECTURES MATCHES "ppc|ppc64")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(Fortran_LINK_FLAGS "-larmadillo -lgfortran -lm")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(Fortran_LINK_FLAGS "-larmadillo -lgfortran -lquadmath -lm")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(ignoreUnusedVariable ${LBFGSB_SHOW_BUILD})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Compiling lbfgsb_cpp as an external library")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -234,7 +240,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Required since RcppArmadillo uses it by default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # /D or -D definition headers are updated according to the compiler 'style'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Use windows style for easy checking on Unix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-add_definitions(/DARMA_32BIT_WORD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++add_definitions(-DARMA_32BIT_WORD)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++add_definitions(-DARMA_USE_HDF5)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-DARMA_ALIEN_MEM_ALLOC_FUNCTION=lkalloc::malloc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-DARMA_ALIEN_MEM_FREE_FUNCTION=lkalloc::free)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-DCARMA_DO_NOT_EXPORT_ALIEN_MEM_FUNCTIONS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -711,7 +718,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_COMMAND}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DBUILD_TYPE=${CMAKE_BUILD_TYPE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -P ${CMAKE_BINARY_DIR}/cmake_install.cmake)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-ADD_DEPENDENCIES(install.lib Kriging armadillo)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ADD_DEPENDENCIES(install.lib Kriging)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ENABLED_PYTHON_BINDING)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_DEPENDENCIES(install.lib _pylibkriging)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/lib/CMakeLists.txt.orig 2023-07-07 00:43:01.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/lib/CMakeLists.txt 2023-07-07 04:10:34.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,7 +33,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX_CLANG_TIDY ${CXX_CLANG_TIDY})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-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 hdf5 lbfgsb_cpp::lbfgsb_cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # TODO check if this method is useful
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # * https://atomheartother.github.io/c++/2018/07/12/CPPDynLib.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dependencies/lbfgsb_cpp/CMakeLists.txt.orig 2023-07-07 00:43:34.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dependencies/lbfgsb_cpp/CMakeLists.txt 2023-07-07 06:09:12.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,10 +30,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake/ExternalFortranProject.cmake.in"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${lbfgsb_VIRTUAL_PROJECT}/CMakeLists.txt" @ONLY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ execute_process(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMMAND ${CMAKE_COMMAND}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- -DCMAKE_Fortran_COMPILER=${CMAKE_Fortran_COMPILER}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ -DCMAKE_Fortran_COMPILER=__FC__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DFortran_LINK_FLAGS="${Fortran_LINK_FLAGS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_INSTALL_PREFIX=${lbfgsb_INSTALL_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -112,4 +111,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(DIRECTORY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${lbfgsb_INSTALL_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${lbfgsb_INSTALL_DIR}/ DESTINATION ${CMAKE_INSTALL_PREFIX})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dependencies/lbfgsb_cpp/cmake/ExternalFortranProject.cmake.in.orig 2023-07-07 00:43:34.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dependencies/lbfgsb_cpp/cmake/ExternalFortranProject.cmake.in 2023-07-07 06:08:25.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,7 +3,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(ExternalProject)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Avoid warnings about unused variables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set(ignoreUnusedVariable ${CMAKE_Fortran_COMPILER})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(ignoreUnusedVariable ${Fortran_LINK_FLAGS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(ignoreUnusedVariable ${EMBED_CUSTOM_BLAS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,7 +11,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BINARY_DIR "@lbfgsb_BINARY_DIR@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMAKE_GENERATOR "@LBFGSB_CMAKE_GENERATOR@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CMAKE_ARGS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "-DCMAKE_Fortran_COMPILER=@CMAKE_Fortran_COMPILER@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "-DCMAKE_Fortran_COMPILER=__FC__"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-DFortran_LINK_FLAGS=@Fortran_LINK_FLAGS@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-DCMAKE_BUILD_TYPE=@CMAKE_BUILD_TYPE@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-DCMAKE_INSTALL_PREFIX=@lbfgsb_INSTALL_DIR@"
</span></pre><pre style='margin:0'>
</pre>