[145938] trunk/dports/databases/mysql56

pixilla at macports.org pixilla at macports.org
Sun Feb 21 11:53:04 PST 2016


Revision: 145938
          https://trac.macports.org/changeset/145938
Author:   pixilla at macports.org
Date:     2016-02-21 11:53:04 -0800 (Sun, 21 Feb 2016)
Log Message:
-----------
databases/mysql56: Fix building with yassl.

Modified Paths:
--------------
    trunk/dports/databases/mysql56/Portfile
    trunk/dports/databases/mysql56/files/patch-cmake-install_layout.cmake.diff

Modified: trunk/dports/databases/mysql56/Portfile
===================================================================
--- trunk/dports/databases/mysql56/Portfile	2016-02-21 18:22:35 UTC (rev 145937)
+++ trunk/dports/databases/mysql56/Portfile	2016-02-21 19:53:04 UTC (rev 145938)
@@ -8,7 +8,7 @@
 version             5.6.29
 # Set revision_client and revision_server to 0 on
 # version bump.
-set revision_client 2
+set revision_client 3
 set revision_server 0
 set version_branch  [join [lrange [split ${version} .] 0 1] .]
 categories          databases
@@ -67,6 +67,8 @@
     post-patch {
         reinplace "s|@NAME@|${name_mysql}|g" \
             ${worksrcpath}/cmake/install_layout.cmake
+        reinplace "s|@WORKSRCPATH@|${worksrcpath}|g" \
+            ${worksrcpath}/cmake/install_layout.cmake
         reinplace "s|@NAME@|${name_mysql}|g" \
             ${cmake.build_dir}/macports/macports-default.cnf \
             ${cmake.build_dir}/macports/my.cnf
@@ -155,12 +157,7 @@
         }
     }
 
-    variant openssl description {Enable OpenSSL support} {}
-    # Until yassl builds use MacPorts openssl.
-    # Getting mysql56 to build with yassl would make the binaries distributable.
-    # When mysql56 builds with yassl remove "true" from the "if" statement below or
-    # put the contents of the "if" block into the openssl variant block.
-    if { true || [variant_isset openssl] } {
+    variant openssl description {Enable OpenSSL support} {
         configure.args-delete   -DWITH_SSL:STRING=bundled
         configure.args-append   -DWITH_SSL:STRING=${prefix}
         depends_lib-append      path:lib/libssl.dylib:openssl

Modified: trunk/dports/databases/mysql56/files/patch-cmake-install_layout.cmake.diff
===================================================================
--- trunk/dports/databases/mysql56/files/patch-cmake-install_layout.cmake.diff	2016-02-21 18:22:35 UTC (rev 145937)
+++ trunk/dports/databases/mysql56/files/patch-cmake-install_layout.cmake.diff	2016-02-21 19:53:04 UTC (rev 145938)
@@ -18,13 +18,15 @@
    LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
    IF(ind EQUAL -1)
      MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
-@@ -222,6 +222,35 @@
+@@ -222,6 +222,37 @@
  SET(INSTALL_MYSQLDATADIR_SVR4           "/var/lib/mysql")
  SET(INSTALL_PLUGINTESTDIR_SVR4          ${plugin_tests})
  
 +#
 +# MACPORTS layout
 +#
++INCLUDE_DIRECTORIES(@WORKSRCPATH@/extra/yassl/include)
++LINK_DIRECTORIES(@WORKSRCPATH@/extra/yassl/lib)
 +SET(INSTALL_BINDIR_MACPORTS             "lib/@NAME@/bin")
 +SET(INSTALL_SBINDIR_MACPORTS            "lib/@NAME@/bin")
 +SET(INSTALL_SCRIPTDIR_MACPORTS          "lib/@NAME@/bin")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160221/e6f9e5ef/attachment.html>


More information about the macports-changes mailing list