<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/8af09a3558b46007f31d3c8dd4e1eba936bfd0a6">https://github.com/macports/macports-ports/commit/8af09a3558b46007f31d3c8dd4e1eba936bfd0a6</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 8af09a3558b scotch: fix tests
</span>8af09a3558b is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 8af09a3558b46007f31d3c8dd4e1eba936bfd0a6
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Wed Dec 14 01:42:45 2022 +0100

<span style='display:block; white-space:pre;color:#404040;'>    scotch: fix tests
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/39812
</span>---
 science/scotch/Portfile                        | 16 +++++++++++
 science/scotch/files/cmake-shared-library.diff | 40 ++++++++++++++++++++++----
 2 files changed, 51 insertions(+), 5 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/scotch/Portfile b/science/scotch/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0a9b4c32fd2..97b2aeca484 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/scotch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/scotch/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,6 +35,8 @@ depends_lib-append          port:bzip2 \
</span>                             port:xz \
                             port:zlib
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_test-append         port:mumps
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles-append           cmake-shared-library.diff
 
 # MPI implementation is not threadsafe, do not use DSCOTCH_PTHREAD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,3 +66,17 @@ if {[variant_isset universal]} {
</span> post-destroot {
     move ${destroot}${prefix}/man ${destroot}${prefix}/share/man
 }
<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;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[mpi_variant_isset]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                            -DMPIEXEC_EXECUTABLE=${prefix}/bin/${mpi.exec}
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-test {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # test infrastructure uses /bin/ps for job parallelism which is forbidden by sandboxing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    append portsandbox_profile " (allow process-exec (literal \"/bin/ps\") (with no-profile))"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/scotch/files/cmake-shared-library.diff b/science/scotch/files/cmake-shared-library.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8591b209851..6df17e89c63 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/scotch/files/cmake-shared-library.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/scotch/files/cmake-shared-library.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.inria.fr/scotch/scotch/-/issues/16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/check/CMakeLists.txt src/check/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6505918..323580a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/check/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/check/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,8 +52,15 @@ set(tgt ${PROJECT_SOURCE_DIR}/tgt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Macro to add quickly a Scotch test executable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ function(add_test_scotch)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   add_executable(${ARGV0} ${ARGV0}.c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  set_target_properties(${ARGV0} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  target_link_libraries(${ARGV0} scotch scotcherr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  set_target_properties(${ARGV0} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    BUILD_WITH_INSTALL_RPATH FALSE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    CMAKE_BUILD_RPATH_USE_ORIGIN TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  if (BUILD_SHARED_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    target_link_directories(${ARGV0} PRIVATE ../libscotch)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    target_link_libraries(${ARGV0} PRIVATE scotch)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    target_link_libraries(${ARGV0} scotch scotcherr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if(${ARGC} GREATER_EQUAL 2)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     add_test(NAME ${ARGV0} COMMAND ${ARGV0})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   endif()
</span> diff --git src/libscotch/CMakeLists.txt src/libscotch/CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index d1ca5b7..a267b8f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d1ca5b7..b3efbd5 100644
</span> --- src/libscotch/CMakeLists.txt
 +++ src/libscotch/CMakeLists.txt
 @@ -550,7 +550,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,20 +35,26 @@ index d1ca5b7..a267b8f 100644
</span>  target_include_directories(scotcherr PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
    $<BUILD_INTERFACE:${GENERATED_INCLUDE_DIR}>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -558,7 +558,11 @@ target_include_directories(scotcherr PUBLIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -558,7 +558,17 @@ target_include_directories(scotcherr PUBLIC
</span>  
  add_dependencies(scotcherr scotch_h)
  
 -add_library(scotcherrexit library_error_exit.c)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+if (BUILD_SHARED_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++option(SCOTCH_SHARED_USE_SCOTCHERR "Linking shared library against libscotcherr instead of libscotcherrexit" ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (BUILD_SHARED_LIBS AND SCOTCH_SHARED_USE_SCOTCHERR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  message(STATUS "Building shared library linked against libscotcherr")
</span> +  target_link_libraries(scotch PRIVATE scotcherr)
<span style='display:block; white-space:pre;background:#e0ffe0;'>++elseif (BUILD_SHARED_LIBS AND NOT SCOTCH_SHARED_USE_SCOTCHERR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  message(STATUS "Building shared library linked against libscotcherrexit")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  target_link_libraries(scotch PRIVATE scotcherrexit)
</span> +endif()
 +
 +add_library(scotcherrexit STATIC library_error_exit.c)
  target_include_directories(scotcherrexit PUBLIC
    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
    $<BUILD_INTERFACE:${GENERATED_INCLUDE_DIR}>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -769,6 +773,10 @@ if(BUILD_PTSCOTCH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -769,6 +779,10 @@ if(BUILD_PTSCOTCH)
</span>  
    add_dependencies(ptscotcherr ptscotch_h scotch_h)
  
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +65,7 @@ index d1ca5b7..a267b8f 100644
</span>    add_library(ptscotcherrexit library_error_exit.c)
    target_include_directories(ptscotcherrexit PUBLIC
      $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -790,6 +798,8 @@ if(BUILD_PTSCOTCH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -790,6 +804,8 @@ if(BUILD_PTSCOTCH)
</span>  endif(BUILD_PTSCOTCH)
  
  foreach(_target ${TARGETS_LIST})
</pre><pre style='margin:0'>

</pre>