<pre style='margin:0'>
Clemens Lang (neverpanic) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a167d860ab52bfe9b6c7b6ece20741024d9a1b4d">https://github.com/macports/macports-ports/commit/a167d860ab52bfe9b6c7b6ece20741024d9a1b4d</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 a167d860ab5 Bear: Update to 3.0.20
</span>a167d860ab5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a167d860ab52bfe9b6c7b6ece20741024d9a1b4d
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Sat Aug 13 14:56:49 2022 +0200
<span style='display:block; white-space:pre;color:#404040;'> Bear: Update to 3.0.20
</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/64633
</span>---
devel/Bear/Portfile | 29 +++++---
.../patch-source-intercept-CMakeLists-txt.patch | 35 ++++++++++
devel/Bear/files/patch-spdlog-header-only.diff | 78 ++++++++++++++++++++++
3 files changed, 133 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/Bear/Portfile b/devel/Bear/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8d52ae8e439..aa17db432b4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/Bear/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/Bear/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,10 +4,10 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup rizsotto Bear 2.4.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9a1ce3fd173b1d9a905844cef69f7a57c3b55464 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e9cb11c75c0cb621650ebfe0d84929286b144d4e6ab5aa4a996f24efd3fd9474 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 50384
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup rizsotto Bear 3.0.20
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 c9bf0be787686071310b766893d02e5708364053 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fd49d25a83fc8eba529132bb05da887b66c8831e38044262c60e14f49d72698c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 125397
</span>
maintainers {cal @neverpanic} openmaintainer
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,9 +22,20 @@ long_description {*}${description} \
</span> available then it is easy to re-run the compilation with different \
programs.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:python38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-source-intercept-CMakeLists-txt.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-spdlog-header-only.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/bin/env @BEAR_PYTHON_EXECUTABLE@|${prefix}/bin/python3.8|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/bear/bear.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.module_path-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/lib/libfmt9/cmake
</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;'>+ port:spdlog \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:nlohmann-json \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:libfmt9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:grpc
</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;'>+ -DENABLE_UNIT_TESTS=Off \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_FUNC_TESTS=Off
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/Bear/files/patch-source-intercept-CMakeLists-txt.patch b/devel/Bear/files/patch-source-intercept-CMakeLists-txt.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..91a9d89ece0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/Bear/files/patch-source-intercept-CMakeLists-txt.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,35 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix undefined __cxxabiv1::__class_type_info vtable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Linking C++ code with the C linker causes a missing vtable for in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+__cxxabiv1::__class_type_info, referenced from runtime type information
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+in el::Linker and el::Resolver. Linking this library with clang++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+instead fixes the issue.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From the upstream git log, it was not clear to me why LINKER_LANGUAGE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+"C" was introduced in the first place.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Full error is:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+| /usr/bin/clang -arch arm64 -isysroot /Library/Developer/CommandLineTools/SDKs/MacOSX12.sdk -mmacosx-version-min=12.0 -dynamiclib -Wl,-headerpad_max_install_names -o libexec.dylib -install_name @rpath/libexec.dylib CMakeFiles/exec.dir/source/report/libexec/lib.cc.o CMakeFiles/exec.dir/source/report/libexec/std.cc.o CMakeFiles/exec_a.dir/source/report/libexec/Buffer.cc.o CMakeFiles/exec_a.dir/source/report/libexec/Environment.cc.o CMakeFiles/exec_a.dir/source/report/libexec/Executor.cc. [...]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+| Undefined symbols for architecture arm64:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+| "vtable for __cxxabiv1::__class_type_info", referenced from:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+| typeinfo for el::Linker in Linker.cc.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+| typeinfo for el::Resolver in Resolver.cc.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+| NOTE: a missing vtable usually means the first non-inline virtual member function has no definition.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+| ld: symbol(s) not found for architecture arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+| clang: error: linker command failed with exit code 1 (use -v to see invocation)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Submitted [https://github.com/rizsotto/Bear/pull/477]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: Clemens Lang <cal@macports.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./source/intercept/CMakeLists.txt.orig 2022-08-13 14:27:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./source/intercept/CMakeLists.txt 2022-08-13 14:27:40.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -180,7 +180,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_target_properties(exec PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LINKER_LANGUAGE "C"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LINKER_LANGUAGE "CXX"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OSX_ARCHITECTURES:STRING "i386;x86_64"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACOSX_RPATH:BOOL ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/Bear/files/patch-spdlog-header-only.diff b/devel/Bear/files/patch-spdlog-header-only.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ca4d6f53a55
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/Bear/files/patch-spdlog-header-only.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,78 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use spdlog::spdlog_header_only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Switch to the header-only version of spdlog, since MacPorts currently ships
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+a precompiled spdlog.a that contains symbols compatible with fmt8, but we're
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+using fmt9.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Upstream-Status: Inappropriate [configuration]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- source/libsys/CMakeLists.txt.orig 2022-08-13 14:41:41.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ source/libsys/CMakeLists.txt 2022-08-13 14:42:11.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16,7 +16,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_DL_LIBS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result_a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fmt::fmt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- spdlog::spdlog)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ spdlog::spdlog_header_only)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (ENABLE_UNIT_TESTS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable(sys_unit_test
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- source/intercept/CMakeLists.txt.orig 2022-08-13 14:41:41.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ source/intercept/CMakeLists.txt 2022-08-13 14:42:04.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,7 +51,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rpc_a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sys_a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result_a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- spdlog::spdlog)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ spdlog::spdlog_header_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;'>+ # Intercept orchestrator executable.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,7 +94,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result_a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sys_a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rpc_a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- spdlog::spdlog)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ spdlog::spdlog_header_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;'>+ # Intercept report sender executable.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- source/bear/CMakeLists.txt.orig 2022-08-13 14:41:41.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ source/bear/CMakeLists.txt 2022-08-13 14:42:25.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7,7 +7,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sys_a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags_a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fmt::fmt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- spdlog::spdlog)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ spdlog::spdlog_header_only)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(GNUInstallDirs)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install(TARGETS bear
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- source/citnames/CMakeLists.txt.orig 2022-08-13 14:41:41.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ source/citnames/CMakeLists.txt 2022-08-13 14:42:20.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -12,7 +12,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ shell_a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sys_a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fmt::fmt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- spdlog::spdlog
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ spdlog::spdlog_header_only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nlohmann_json::nlohmann_json)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_options(citnames_json_a PRIVATE -fexceptions)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -44,7 +44,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sys_a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exec_a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fmt::fmt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- spdlog::spdlog)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ spdlog::spdlog_header_only)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Create an executable from the sub projects.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_executable(citnames
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- source/libmain/CMakeLists.txt.orig 2022-08-13 14:41:41.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ source/libmain/CMakeLists.txt 2022-08-13 14:42:30.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -11,4 +11,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ result_a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flags_a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fmt::fmt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- spdlog::spdlog)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ spdlog::spdlog_header_only)
</span></pre><pre style='margin:0'>
</pre>