[122394] trunk/dports/databases/percona/Portfile

pixilla at macports.org pixilla at macports.org
Mon Jul 21 17:02:42 PDT 2014


Revision: 122394
          https://trac.macports.org/changeset/122394
Author:   pixilla at macports.org
Date:     2014-07-21 17:02:42 -0700 (Mon, 21 Jul 2014)
Log Message:
-----------
databases/percona:
- Build with openssl as yassl does not build on some systems. Closes #44379.
- Revbump for systems where yassl did build.

Modified Paths:
--------------
    trunk/dports/databases/percona/Portfile

Modified: trunk/dports/databases/percona/Portfile
===================================================================
--- trunk/dports/databases/percona/Portfile	2014-07-21 23:43:19 UTC (rev 122393)
+++ trunk/dports/databases/percona/Portfile	2014-07-22 00:02:42 UTC (rev 122394)
@@ -9,7 +9,7 @@
 set version_mysql   5.6.19
 set release         67.0
 # Please set revision_client and revision_server to 0 if you bump version_mysql or release.
-set revision_client 0
+set revision_client 1
 set revision_server 0
 version             ${version_mysql}-${release}
 categories          databases
@@ -81,6 +81,11 @@
             ${worksrcpath}/build_macports/macports/my.cnf
     }
 
+    if { (![variant_isset universal] && ${build_arch} eq "i386") || ([variant_isset universal] && [lsearch ${universal_archs} i386] != -1) } {
+        # switch to /usr/bin/gcc and /usr/bin/g++
+        # closest to SET(CMAKE_CXX_COMPILER g++) removed in the patchfile
+        configure.compiler gcc
+    }
     configure.cmd       cmake ..
     configure.dir       ${worksrcpath}/build_macports
     build.dir           ${worksrcpath}/build_macports
@@ -167,11 +172,15 @@
         }
     }
 
-    variant openssl description {Enable OpenSSL support} {
-
+    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] } {
+        configure.args-delete   -DWITH_SSL:STRING=bundled
+        configure.args-append   -DWITH_SSL:STRING=${prefix}
         depends_lib-append      port:openssl
-        configure.args-delete   -DWITH_SSL:STRING=no
-        configure.args-append   -DWITH_SSL:STRING=system
         archcheck.files-append  lib/libssl.dylib
     }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140721/59823bf4/attachment.html>


More information about the macports-changes mailing list