<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/935f00861840bdd40a58d81785a2cc0be61c262d">https://github.com/macports/macports-ports/commit/935f00861840bdd40a58d81785a2cc0be61c262d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 935f00861840bdd40a58d81785a2cc0be61c262d
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Mon Jun 10 02:56:36 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> mysql8: disable CMake Xcode check and use the compiler-blacklist portgroup
</span>---
databases/mysql8/Portfile | 10 ++++--
.../mysql8/files/patch-disable-xcode-check.diff | 42 ++++++++++++++++++++++
2 files changed, 49 insertions(+), 3 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql8/Portfile b/databases/mysql8/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d994640..d7a2dbe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql8/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,8 +12,8 @@ maintainers {gmail.com:herby.gillot @herbygillot} openmaintainer
</span> homepage https://www.mysql.com/
# Set revision_client and revision_server to 0 on version bump.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set revision_client 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set revision_server 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_client 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_server 4
</span>
set name_mysql ${name}
set version_branch [join [lrange [split ${version} .] 0 1] .]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +25,7 @@ if {$subport eq $name} {
</span> PortGroup muniversal 1.0
PortGroup cmake 1.1
PortGroup select 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup compiler_blacklist_versions 1.0
</span>
description Multithreaded SQL database server
long_description MySQL is an open-source, multi-threaded SQL database.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,6 +62,8 @@ if {$subport eq $name} {
</span>
use_parallel_build yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append {clang < 800}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Use default CMake build_types
if {[variant_isset debug]} {
cmake.build_type Debug
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,7 +121,8 @@ if {$subport eq $name} {
</span> patch.pre_args -p1
patchfiles patch-cmake-install_layout.cmake.diff \
patch-router-cmake-set_rpath.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-sql-local-boost.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-sql-local-boost.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-disable-xcode-check.diff
</span>
post-extract {
file mkdir ${cmake.build_dir}/macports
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql8/files/patch-disable-xcode-check.diff b/databases/mysql8/files/patch-disable-xcode-check.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..59569ba
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql8/files/patch-disable-xcode-check.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ./cmake/os/Darwin.cmake.orig 2019-06-10 02:21:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ./cmake/os/Darwin.cmake 2019-06-10 02:46:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,21 +24,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDE(CheckCSourceRuns)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# We require at least XCode 9.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-IF(NOT FORCE_UNSUPPORTED_COMPILER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CHECK_C_SOURCE_RUNS("
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int main()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return (__clang_major__ < 9);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- }" HAVE_SUPPORTED_CLANG_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MESSAGE(FATAL_ERROR "XCode 9.0 or newer is required!")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MESSAGE(FATAL_ERROR "Unsupported compiler!")
</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;'>++# MACPORTS: XCode version check disabled to rely instead on compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# blacklisting in the ports build process.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# # We require at least XCode 9.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# IF(NOT FORCE_UNSUPPORTED_COMPILER)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# CHECK_C_SOURCE_RUNS("
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# int main()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# return (__clang_major__ <= 9);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# }" HAVE_SUPPORTED_CLANG_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# MESSAGE(FATAL_ERROR "XCode 9.0 or newer is required!")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ENDIF()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# ELSE()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# MESSAGE(FATAL_ERROR "Unsupported compiler!")
</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;'>+ # 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></pre><pre style='margin:0'>
</pre>