<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5741e9657e2fced0b576b2adc4f2e5eb1282334f">https://github.com/macports/macports-ports/commit/5741e9657e2fced0b576b2adc4f2e5eb1282334f</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 5741e9657e2 PDAL: enable use of system libunwind, drop dependency of port
</span>5741e9657e2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5741e9657e2fced0b576b2adc4f2e5eb1282334f
</span>Author: nilason <n_larsson@yahoo.com>
AuthorDate: Fri Sep 29 18:47:11 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> PDAL: enable use of system libunwind, drop dependency of port
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> This doesn't solve the problem with Xcode 15, automatically linking to
</span><span style='display:block; white-space:pre;color:#404040;'> MacPorts' libunwind, but it makes it possible to some degree avoid
</span><span style='display:block; white-space:pre;color:#404040;'> installing the port in the first place.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/ticket/68250
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/ticket/66250
</span>---
gis/pdal/Portfile | 17 +++++---
gis/pdal/files/patch-libunwind-cmake.diff | 70 +++++++++++++++++++++++++++++++
2 files changed, 82 insertions(+), 5 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/pdal/Portfile b/gis/pdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ebe17614f35..d983f79ce33 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/pdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/pdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup github 1.0
</span> PortGroup openssl 1.0
github.setup PDAL PDAL 2.5.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories gis
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,17 +45,24 @@ depends_lib-append port:geos \
</span> port:zlib \
port:zstd \
port:libxml2 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:curl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libunwind
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:curl
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-powerpc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-powerpc.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-libunwind-cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Starting with Xcode 15, the port libunwind is causing crashes,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/68250 and https://trac.macports.org/ticket/66250.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp $xcodeversion >= 15.0]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts libunwind
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
configure.args -DWITH_ZSTD=ON \
-DWITH_ZLIB=ON \
-DWITH_LZMA=OFF \
-DWITH_TESTS=OFF \
-DBUILD_TOOLS_NITFWRAP=OFF \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_COMPLETION=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_COMPLETION=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_BACKTRACE=OFF
</span>
configure.args-append \
-DBUILD_PLUGIN_CPD=OFF \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/pdal/files/patch-libunwind-cmake.diff b/gis/pdal/files/patch-libunwind-cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..cb72c254c60
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/pdal/files/patch-libunwind-cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,70 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Committed 2023-09-29 upstreams to master:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/PDAL/PDAL/commit/a14f8648a2f43296e032901d75969ce9070dc563
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/modules/FindLibunwind.cmake.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/modules/FindLibunwind.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,14 +2,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ~~~~~~~~~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # CMake module to search for LIBUNWIND
</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;'>+-find_library(LIBUNWIND_LIBRARY unwind)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_path(LIBUNWIND_INCLUDE_DIR libunwind.h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-find_package_handle_standard_args(LIBUNWIND REQUIRED_VARS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBUNWIND_LIBRARY LIBUNWIND_INCLUDE_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(NOT APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_library(LIBUNWIND_LIBRARY unwind)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package_handle_standard_args(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBUNWIND REQUIRED_VARS LIBUNWIND_LIBRARY LIBUNWIND_INCLUDE_DIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package_handle_standard_args(LIBUNWIND
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ REQUIRED_VARS LIBUNWIND_INCLUDE_DIR)
</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;'>+-if (LIBUNWIND_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(LIBUNWIND_LIBRARIES ${LIBUNWIND_LIBRARY})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(LIBUNWIND_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(LIBUNWIND_LIBRARY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(LIBUNWIND_LIBRARIES ${LIBUNWIND_LIBRARY})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(LIBUNWIND_INCLUDE_DIRS ${LIBUNWIND_INCLUDE_DIR})
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Make backtrace optional, committed 2023-10-02 upstreams to master:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/PDAL/PDAL/commit/95c5e378d6b31b88cbdbabcb75a71ffe9d6a1c10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/options.cmake.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/options.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -109,6 +109,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "Choose if PDAL should be built with Abseil support for testing" FALSE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_feature_info("Abseil debugging support " WITH_ABSEIL "unit tests")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++option(WITH_BACKTRACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "Build with backtrace" ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++add_feature_info("Backtrace" WITH_BACKTRACE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "build with backtrace (Libunwind/Libexecinfo) support")
</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;'>+ # Choose dependent options
</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;'>+--- pdal/util/CMakeLists.txt.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pdal/util/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,10 +11,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(${PDAL_CMAKE_DIR}/unwind.cmake)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(${PDAL_CMAKE_DIR}/utfcpp.cmake)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(LIBUNWIND_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(LIBUNWIND_FOUND AND WITH_BACKTRACE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(BACKTRACE_SOURCE BacktraceUnwind.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(BACKTRACE_LIBRARIES ${LIBUNWIND_LIBRARIES} ${CMAKE_DL_LIBS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-elseif(LIBEXECINFO_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++elseif(LIBEXECINFO_FOUND AND WITH_BACKTRACE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(BACKTRACE_SOURCE BacktraceExecinfo.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(BACKTRACE_LIBRARIES ${LIBEXECINFO_LIBRARIES} ${CMAKE_DL_LIBS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>