<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/f8cb8e533727e9eb10283c52205ccc242a2616a6">https://github.com/macports/macports-ports/commit/f8cb8e533727e9eb10283c52205ccc242a2616a6</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f8cb8e533727e9eb10283c52205ccc242a2616a6
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Mon Sep 2 16:26:29 2024 +0800

<span style='display:block; white-space:pre;color:#404040;'>    mysql57: fix for powerpc
</span>---
 databases/mysql57/Portfile                      | 15 ++++++++++++--
 databases/mysql57/files/patch-NOTE_TRIGGER.diff | 14 +++++++++++++
 databases/mysql57/files/patch-powerpc.diff      | 27 +++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 2 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql57/Portfile b/databases/mysql57/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3396f8440a0..d8226e17108 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql57/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,6 +77,13 @@ if {$subport eq $name} {
</span>                     patch-lockpool.diff \
                     patch-cmake-fix-test-env.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    platform darwin powerpc {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # These can be applied unconditionally, but unneeded outside of ppc.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-powerpc.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-NOTE_TRIGGER.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     post-patch {
         reinplace "s|@NAME@|${name_mysql}|g" \
             ${worksrcpath}/cmake/install_layout.cmake
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,7 +101,6 @@ if {$subport eq $name} {
</span>             ${worksrcpath}/cmake/merge_archives.cmake.in
     }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span>     patchfiles-append \
                     patch-rename_version.diff
     post-patch {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,7 +139,12 @@ if {$subport eq $name} {
</span>     configure.cppflags-delete \
         -I${prefix}/include
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    use_parallel_build  yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if {[string match *gcc* ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            -DFORCE_UNSUPPORTED_COMPILER=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        configure.ldflags-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            -latomic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    }
</span> 
     select.group        mysql
     select.file         ${filespath}/${name_mysql}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql57/files/patch-NOTE_TRIGGER.diff b/databases/mysql57/files/patch-NOTE_TRIGGER.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5c54e1d80da
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql57/files/patch-NOTE_TRIGGER.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/mysys/kqueue_timers.c        2023-10-11 19:42:50.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/mysys/kqueue_timers.c        2024-09-02 16:18:37.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -150,7 +150,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   struct kevent kev;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(NOTE_TRIGGER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   EV_SET(&kev, 0, EVFILT_USER, 0, NOTE_TRIGGER, 0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(EV_TRIGGER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  EV_SET(&kev, 0, EVFILT_USER, EV_TRIGGER, 0, 0, 0);
</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 (kevent(kq_fd, &kev, 1, NULL, 0, NULL) < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     my_message_local(ERROR_LEVEL,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql57/files/patch-powerpc.diff b/databases/mysql57/files/patch-powerpc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..f75f8609293
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql57/files/patch-powerpc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/cmake/os/Darwin.cmake        2023-03-16 23:25:04.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/cmake/os/Darwin.cmake        2023-05-18 10:00:33.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,5 +47,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This is used for the version_compile_machine variable.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  SET(MYSQL_MACHINE_TYPE "x86_64")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  IF(CMAKE_OSX_ARCHITECTURES MATCHES "ppc64")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    SET(MYSQL_MACHINE_TYPE "ppc64")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    SET(MYSQL_MACHINE_TYPE "x86_64")
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/rapid/plugin/x/CMakeLists.txt        2023-05-18 09:26:35.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/rapid/plugin/x/CMakeLists.txt        2023-05-18 12:13:03.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -135,6 +135,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     SET(BOOST_LIB_SOURCES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       ${BOOST_SOURCES_DIR}/libs/atomic/src/lockpool.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  IF(APPLE AND CMAKE_OSX_ARCHITECTURES MATCHES "ppc|ppc64")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++    SET(BOOST_LIB_SOURCES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++      ${BOOST_SOURCES_DIR}/libs/atomic/src/lockpool.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   IF (CMAKE_CXX_COMPILER_ID STREQUAL "SunPro")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+     SET(BOOST_LIB_SOURCES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       ${BOOST_SOURCES_DIR}/libs/atomic/src/lockpool.cpp)
</span></pre><pre style='margin:0'>

</pre>