<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d6ec1caba753cf2edbe8d44779c704ab4c8c3042">https://github.com/macports/macports-ports/commit/d6ec1caba753cf2edbe8d44779c704ab4c8c3042</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 d6ec1ca mysql8: Remove unneeded patch
</span>d6ec1ca is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d6ec1caba753cf2edbe8d44779c704ab4c8c3042
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Wed Jun 12 12:48:29 2019 -0500
<span style='display:block; white-space:pre;color:#404040;'> mysql8: Remove unneeded patch
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The same result can be achieved with a configure flag.
</span>---
databases/mysql8/Portfile | 4 +--
.../mysql8/files/patch-disable-xcode-check.diff | 42 ----------------------
2 files changed, 2 insertions(+), 44 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 fbbcad4..1798992 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;'>@@ -104,6 +104,7 @@ if {$subport eq $name} {
</span>
# Build configuration
configure.args-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DFORCE_UNSUPPORTED_COMPILER=ON \
</span> -DDOWNLOAD_BOOST=0 \
-DENABLE_DOWNLOADS:BOOL=OFF \
-DINSTALL_LAYOUT:STRING=MACPORTS \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,8 +127,7 @@ 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:#ffe0e0;'>- patch-disable-xcode-check.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-sql-local-boost.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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 59569ba..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql8/files/patch-disable-xcode-check.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,42 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./cmake/os/Darwin.cmake.orig 2019-06-10 02:21:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./cmake/os/Darwin.cmake 2019-06-10 02:46:18.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -24,21 +24,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INCLUDE(CheckCSourceRuns)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# We require at least XCode 9.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--IF(NOT FORCE_UNSUPPORTED_COMPILER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CHECK_C_SOURCE_RUNS("
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int main()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return (__clang_major__ < 9);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }" HAVE_SUPPORTED_CLANG_VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MESSAGE(FATAL_ERROR "XCode 9.0 or newer is required!")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ELSE()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MESSAGE(FATAL_ERROR "Unsupported compiler!")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# MACPORTS: XCode version check disabled to rely instead on compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# blacklisting in the ports build process.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# # We require at least XCode 9.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# IF(NOT FORCE_UNSUPPORTED_COMPILER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# CHECK_C_SOURCE_RUNS("
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# int main()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# return (__clang_major__ <= 9);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# }" HAVE_SUPPORTED_CLANG_VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# IF(NOT HAVE_SUPPORTED_CLANG_VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# MESSAGE(FATAL_ERROR "XCode 9.0 or newer is required!")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ELSE()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# MESSAGE(FATAL_ERROR "Unsupported compiler!")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This is used for the version_compile_machine variable.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
</span></pre><pre style='margin:0'>
</pre>