<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b3cd12c0a38bfb719418669ead2aec5a73b00fd2">https://github.com/macports/macports-ports/commit/b3cd12c0a38bfb719418669ead2aec5a73b00fd2</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 b3cd12c0a38 mysql8: change ssl flag to system vs copy for libcrypto and openssl
</span>b3cd12c0a38 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b3cd12c0a38bfb719418669ead2aec5a73b00fd2
</span>Author: jhoyt4 <john.hoyt@gmail.com>
AuthorDate: Wed Jun 26 19:54:56 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> mysql8: change ssl flag to system vs copy for libcrypto and openssl
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> mysql8 has two mechanisms for linking to openssl libraries, system
</span><span style='display:block; white-space:pre;color:#404040;'> and copy/update. Per the mysql8 devs the "system" method is
</span><span style='display:block; white-space:pre;color:#404040;'> perferred and the one they use internally. To implement it,
</span><span style='display:block; white-space:pre;color:#404040;'> -DWITH_SSL must be set to "system" and -DCMAKE_PREFIX_PATH should be
</span><span style='display:block; white-space:pre;color:#404040;'> set to the open ssl lib path to aide cmake in finding the preferred
</span><span style='display:block; white-space:pre;color:#404040;'> version of openssl.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Previously, the copy and update mehtod was used due to setting the
</span><span style='display:block; white-space:pre;color:#404040;'> following flags via the openssl portgroup
</span><span style='display:block; white-space:pre;color:#404040;'> -DOPENSSL_ROOT_DIR=[openssl::install_area],
</span><span style='display:block; white-space:pre;color:#404040;'> -DOPENSSL_INCLUDE_DIR=[openssl::include_dir]
</span><span style='display:block; white-space:pre;color:#404040;'> -DWITH_SSL=[openssl::install_area]
</span><span style='display:block; white-space:pre;color:#404040;'> All three must be removed from the configure process to prevent the
</span><span style='display:block; white-space:pre;color:#404040;'> copy/paste
</span>---
databases/mysql8/Portfile | 31 ++++-
.../files/patch-copy_openssl_binary.cmake.diff | 55 --------
databases/mysql8/files/patch-ssl.cmake.diff | 153 ---------------------
3 files changed, 26 insertions(+), 213 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 63063231fee..24a06934d15 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;'>@@ -13,7 +13,7 @@ maintainers {gmail.com:herby.gillot @herbygillot} \
</span> openmaintainer
# Set revision_client and revision_server to 0 on version bump.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set revision_client 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set revision_client 4
</span> set revision_server 3
set name_mysql ${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,19 +132,30 @@ if {$subport eq $name} {
</span> -DWITH_LZ4=system \
-DWITH_PROTOBUF=system \
-DWITH_SASL=system \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DWITH_SSL=[openssl::install_area] \
</span> -DWITH_ZLIB=system \
-DWITH_ZSTD=system
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Per the mysql8 devs, setting -DCMAKE_PREFIX_PATH the {macports_prefx}/lib file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # forces the cmake build process to use the macports "system"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_PREFIX_PATH=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # per the mysql8 devs, if -DWITH_SSL is set to "system" no attempts are made to copy and
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # update the openssl / libcrypto libs into the mysql directory using the macports
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # files in place. Since we'll be using the macports libs in place, the mysql8 devs also
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # suggest setting -DCMAKE_PREFIX_PATH to aide cmake in finding the preferred version of openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_PREFIX_PATH=[openssl::install_area] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_SSL=system \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args-append \
-DWITH_ROUTER:BOOL=OFF
patch.pre_args-replace -p0 -p1
patchfiles patch-cmake-install_layout.cmake.diff \
patch-readline.cmake.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-scripts-cmakelists.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-ssl.cmake.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-copy_openssl_binary.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-scripts-cmakelists.diff
</span>
post-extract {
file mkdir ${cmake.build_dir}/macports
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -153,6 +164,16 @@ if {$subport eq $name} {
</span> ${cmake.build_dir}/macports/
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # removing these three ssl related configure flags added by the openssl portgroup is required
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # to use the macports openssl / libcrypto libs in place. per the mysql8 devs, this is the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # preferred method to the copy and update method
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOPENSSL_ROOT_DIR=[openssl::install_area] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DOPENSSL_INCLUDE_DIR=[openssl::include_dir] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DWITH_SSL=[openssl::install_area]
</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" \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql8/files/patch-copy_openssl_binary.cmake.diff b/databases/mysql8/files/patch-copy_openssl_binary.cmake.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3d57ef1dbe4..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql8/files/patch-copy_openssl_binary.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,55 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cmake/copy_openssl_binary.cmake 2024-06-21 09:47:38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cmake/copy_openssl_binary.cmake 2024-06-21 09:49:11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,6 +68,23 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF(LINUX)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ execute_process(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ COMMAND which port
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ RESULT_VARIABLE DETECT_MACPORTS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OUTPUT_VARIABLE PKGMGR_PREFIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ execute_process(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ COMMAND brew --prefix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ RESULT_VARIABLE DETECT_HOMEBREW
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OUTPUT_VARIABLE PKGMGR_PREFIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IF(DETECT_MACPORTS EQUAL 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(MYSQL_LIB_DIR "../mysql")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ELSEIF(DETECT_HOMEBREW EQUAL 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(MYSQL_LIB_DIR "../lib")
</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;'>- MESSAGE(STATUS "CRYPTO_VERSION is ${CRYPTO_VERSION}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE(STATUS "OPENSSL_VERSION is ${OPENSSL_VERSION}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXECUTE_PROCESS(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -92,11 +109,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(BUILD_IS_SINGLE_CONFIG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install_name_tool -change old new file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXECUTE_PROCESS(COMMAND install_name_tool -change
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${LIBSSL_MATCH}" "@loader_path/../lib/${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "${LIBSSL_MATCH}" "@loader_path/${MYSQL_LIB_DIR}/${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "./${executable_name}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXECUTE_PROCESS(COMMAND install_name_tool -change
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "${LIBCRYPTO_MATCH}" "@loader_path/../lib/${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "${LIBCRYPTO_MATCH}" "@loader_path/${MYSQL_LIB_DIR}/${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "./${executable_name}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXECUTE_PROCESS(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -106,12 +123,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # install_name_tool -change old new file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXECUTE_PROCESS(COMMAND install_name_tool -change
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${LIBSSL_MATCH}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "@loader_path/../../lib/${CMAKE_CFG_INTDIR}/${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "@loader_path/../../${MYSQL_LIB_DIR}/${CMAKE_CFG_INTDIR}/${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "./${CMAKE_CFG_INTDIR}/${executable_name}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXECUTE_PROCESS(COMMAND install_name_tool -change
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${LIBCRYPTO_MATCH}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "@loader_path/../../lib/${CMAKE_CFG_INTDIR}/${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "@loader_path/../${MYSQL_LIB_DIR}/${CMAKE_CFG_INTDIR}/${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "./${CMAKE_CFG_INTDIR}/${executable_name}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXECUTE_PROCESS(
</span>\ No newline at end of file
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql8/files/patch-ssl.cmake.diff b/databases/mysql8/files/patch-ssl.cmake.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4359b244b0f..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql8/files/patch-ssl.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,153 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/cmake/ssl.cmake 2024-06-21 09:47:38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/cmake/ssl.cmake 2024-06-21 09:49:11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,19 +46,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://brew.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://formulae.brew.sh/formula/openssl@1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://formulae.brew.sh/formula/openssl@3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# we give a hint ${HOMEBREW_HOME}/openssl to find_package(OpenSSL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# we give a hint ${HOMEBREW_HOME}/openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # On Windows, we treat this "system" library as if cmake had been
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # invoked with -DWITH_SSL=</path/to/custom/openssl>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # On macOS we treat it as a system library, which means that the generated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# binaries end up having dependencies on Homebrew libraries.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# binaries end up having dependencies on Homebrew or MacPorts libraries.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Note that 'cmake -DWITH_SSL=<some path>'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # is NOT handled in the same way as 'cmake -DWITH_SSL=system'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # which means that for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 'cmake -DWITH_SSL=/usr/local/opt/openssl'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # or, on Apple silicon:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 'cmake -DWITH_SSL=/opt/homebrew/opt/openssl'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# or, on MacPorts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# 'cmake -DWITH_SSL=/opt/local/libexec/openssl3'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # we will treat the libraries as external, and copy them into our build tree.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # On el7:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -350,9 +352,26 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For all non-windows platforms, use the standard FIND_PACKAGE utility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # to locate OpenSSL.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FUNCTION(FIND_SYSTEM_OPENSSL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # For APPLE we set the hint ${HOMEBREW_HOME}/openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- IF(APPLE AND NOT OPENSSL_ROOT_DIR)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(OPENSSL_ROOT_DIR "${HOMEBREW_HOME}/openssl")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # MacPorts or Homebrew?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ execute_process(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ COMMAND which port
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ RESULT_VARIABLE DETECT_MACPORTS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OUTPUT_VARIABLE PKGMGR_PREFIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ execute_process(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ COMMAND brew --prefix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ RESULT_VARIABLE DETECT_HOMEBREW
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OUTPUT_VARIABLE PKGMGR_PREFIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ IF(DETECT_MACPORTS EQUAL 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(OPENSSL_ROOT_DIR "${PKGMGR_PREFIX}/libexec/openssl3")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(OPENSSL_ALT_ROOT_DIR "${PKGMGR_PREFIX}/openssl11")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(MYSQL_LIB_DIR "${PKGMGR_PREFIX}/libexec/mysql8/mysql")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ELSEIF(DETECT_HOMEBREW EQUAL 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(OPENSSL_ROOT_DIR "${PKGMGR_PREFIX}/openssl")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(OPENSSL_ALT_ROOT_DIR "${PKGMGR_PREFIX}/openssl@1.1")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(MYSQL_LIB_DIR "../lib")
</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;'>- # Will set OPENSSL_FOUND, OPENSSL_INCLUDE_DIR and others.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -360,8 +379,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Re-try, in case the symlink is not found.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(NOT OPENSSL_FOUND AND APPLE AND
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OPENSSL_ROOT_DIR STREQUAL "${HOMEBREW_HOME}/openssl")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SET(OPENSSL_ROOT_DIR "${HOMEBREW_HOME}/openssl@1.1")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPENSSL_ROOT_DIR STREQUAL "${OPENSSL_ROOT_DIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SET(OPENSSL_ROOT_DIR "${OPENSSL_ALT_ROOT_DIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FIND_PACKAGE(OpenSSL)
</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;'>-@@ -372,7 +391,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FIND_OPENSSL_VERSION()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Homebrew "system" OpenSSL needs:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Homebrew/Macports "system" OpenSSL needs:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(NOT OPENSSL_INCLUDE_DIR STREQUAL "/usr/include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INCLUDE_DIRECTORIES(BEFORE SYSTEM ${OPENSSL_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -632,8 +651,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(APPLE_WITH_CUSTOM_SSL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # on Homebrew
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # CRYPTO_LIBRARY is .../lib/libcrypto.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # CRYPTO_VERSION is .../lib/libcrypto.1.0.0.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # CRYPTO_VERSION is .../lib/libcrypto.3.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # on Macports
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # CRYPTO_LIBRARY is ${MACPORTS_PREFIX}/lib/libcrypto.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # CRYPTO_VERSION is ${MACPORTS_PREFIX}/lib/libcrypto.3.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXECUTE_PROCESS(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND readlink "${CRYPTO_LIBRARY}" OUTPUT_VARIABLE CRYPTO_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OUTPUT_STRIP_TRAILING_WHITESPACE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -641,7 +665,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND readlink "${OPENSSL_LIBRARY}" OUTPUT_VARIABLE OPENSSL_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OUTPUT_STRIP_TRAILING_WHITESPACE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Replace dependency "/Volumes/.../lib/libcrypto.1.0.0.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Replace dependency "*/libcrypto.3.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXECUTE_PROCESS(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND otool -L "${OPENSSL_LIBRARY}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OUTPUT_VARIABLE OTOOL_OPENSSL_DEPS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -702,9 +726,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Create symlinks for plugins, see MYSQL_ADD_PLUGIN/install_name_tool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_CUSTOM_TARGET(link_openssl_dlls ALL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "../lib/${CRYPTO_VERSION}" "${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "${MYSQL_LIB_DIR}/${CRYPTO_VERSION}" "${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "../lib/${OPENSSL_VERSION}" "${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "${MYSQL_LIB_DIR}/${OPENSSL_VERSION}" "${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/plugin_output_directory"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BYPRODUCTS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -715,9 +739,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- IF(NOT BUILD_IS_SINGLE_CONFIG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_CUSTOM_TARGET(link_openssl_dlls_cmake_cfg_intdir ALL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "../../lib/${CMAKE_CFG_INTDIR}/${CRYPTO_VERSION}" "${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "../${MYSQL_LIB_DIR}/${CMAKE_CFG_INTDIR}/${CRYPTO_VERSION}" "${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "../../lib/${CMAKE_CFG_INTDIR}/${OPENSSL_VERSION}" "${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "../${MYSQL_LIB_DIR}/${CMAKE_CFG_INTDIR}/${OPENSSL_VERSION}" "${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${CMAKE_BINARY_DIR}/plugin_output_directory/${CMAKE_CFG_INTDIR}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -728,13 +752,13 @@
</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;'>- # Directory layout after 'make install' is different.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Create some symlinks from lib/plugin/*.dylib to ../../lib/*.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Create some symlinks from mysql/plugin/*.dylib to ../../mysql/*.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FILE(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/plugin_output_directory/plugin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_CUSTOM_TARGET(link_openssl_dlls_for_install ALL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "../../lib/${CRYPTO_VERSION}" "${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "../${MYSQL_LIB_DIR}/${CRYPTO_VERSION}" "${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "../../lib/${OPENSSL_VERSION}" "${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "../${MYSQL_LIB_DIR}/${OPENSSL_VERSION}" "${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/plugin_output_directory/plugin"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See INSTALL_DEBUG_TARGET used for installing debug versions of plugins.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -742,9 +766,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FILE(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/plugin_output_directory/plugin/debug")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_CUSTOM_TARGET(link_openssl_dlls_for_install_debug ALL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "../../../lib/${CRYPTO_VERSION}" "${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "../../${MYSQL_LIB_DIR}/${CRYPTO_VERSION}" "${CRYPTO_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- COMMAND ${CMAKE_COMMAND} -E create_symlink
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- "../../../lib/${OPENSSL_VERSION}" "${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "../../${MYSQL_LIB_DIR}/${OPENSSL_VERSION}" "${OPENSSL_VERSION}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/plugin_output_directory/plugin/debug"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF()
</span>\ No newline at end of file
</pre><pre style='margin:0'>
</pre>