<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a74faaec14ae7977a095fcd28e0a65affa45154a">https://github.com/macports/macports-ports/commit/a74faaec14ae7977a095fcd28e0a65affa45154a</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 a74faaec14a mariadb: fix build for Ventura and arm64
</span>a74faaec14a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a74faaec14ae7977a095fcd28e0a65affa45154a
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sun Feb 12 09:12:13 2023 -0800
<span style='display:block; white-space:pre;color:#404040;'> mariadb: fix build for Ventura and arm64
</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/66143
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/66169
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/63471
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> upstream refs:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/MariaDB/server/commit/e788738e18bd5cedb21f75b21f902f1bbcc34719
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> (only part of this commit needed/used):
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/MariaDB/server/commit/b1241585b2baf2e62b75febdee2757fc2d3f6488
</span>---
databases/mariadb/Portfile | 3 ++-
.../files/patch-mariadb-Ventura-and-arm64.diff | 27 ++++++++++++++++++++++
2 files changed, 29 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb/Portfile b/databases/mariadb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8f46fd91996..9fdd276ef10 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mariadb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,8 @@ if {$subport eq $name} {
</span>
patch.pre_args -p1
patchfiles patch-cmake-install_layout.cmake.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-mariadb-Ventura-and-arm64.diff
</span>
checksums rmd160 c1df56d5c9ae118693e721aefb18fb19277bf5c0 \
sha256 23ff96db2215d3d2eb8697488719153c83ac4d131f504ae397f43c14c6d91ba3 \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mariadb/files/patch-mariadb-Ventura-and-arm64.diff b/databases/mariadb/files/patch-mariadb-Ventura-and-arm64.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..d2315298504
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mariadb/files/patch-mariadb-Ventura-and-arm64.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;'>+diff --git a/include/my_global.h b/include/my_global.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 01a1dca..04c487e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/include/my_global.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/include/my_global.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -174,7 +174,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # if defined(__i386__) || defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define SIZEOF_CHARP 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define SIZEOF_LONG 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# elif defined(__x86_64__) || defined(__ppc64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# elif defined(__x86_64__) || defined(__ppc64__) || defined(__aarch64__) || defined(__arm64__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define SIZEOF_CHARP 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define SIZEOF_LONG 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/storage/perfschema/CMakeLists.txt b/storage/perfschema/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f8ee1ca..3445c40 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/storage/perfschema/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/storage/perfschema/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -13,8 +13,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # along with this program; if not, write to the Free Software Foundation,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${CMAKE_SOURCE_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_SOURCE_DIR}/sql
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_SOURCE_DIR}/regex
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${CMAKE_SOURCE_DIR}/extra/yassl/include)
</span></pre><pre style='margin:0'>
</pre>