[118041] trunk/dports/databases/mysql56

[pixilla at macports.org]

Revision: 118041
          https://trac.macports.org/changeset/118041
Author:   pixilla at macports.org
Date:     2014-03-19 17:28:20 -0700 (Wed, 19 Mar 2014)
Log Message:
-----------
databases/mysql56:
- Fix universal build. Closes #42938
- Use the right compiler. Closes #42943

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

Added Paths:
-----------
    trunk/dports/databases/mysql56/files/patch-CMakeLists.txt.diff

Modified: trunk/dports/databases/mysql56/Portfile
===================================================================
--- trunk/dports/databases/mysql56/Portfile	2014-03-20 00:12:44 UTC (rev 118040)
+++ trunk/dports/databases/mysql56/Portfile	2014-03-20 00:28:20 UTC (rev 118041)
@@ -2,12 +2,13 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           compiler_blacklist_versions 1.0
 
 name                mysql56
 set name_mysql      ${name}
 version             5.6.16
 # Set revision_client and revision_server to 0 on version bump.
-set revision_client 1
+set revision_client 2
 set revision_server 0
 set version_branch  [join [lrange [split ${version} .] 0 1] .]
 categories          databases
@@ -40,6 +41,22 @@
     # and SUPPORTFILESDIR.
     patchfiles-append   patch-scripts-mysql_install_db.pl.in.diff
 
+    # Don't allow mysql to set the compiler to g++
+    # See http://bazaar.launchpad.net/~mysql/mysql-server/5.6/revision/4223.1.4
+    # See also #42943
+    patchfiles-append   patch-CMakeLists.txt.diff
+    if { (![variant_isset universal] && ${build_arch} eq "i386") || ([variant_isset universal] && [lsearch ${universal_archs} i386] != -1) } {
+        # Disallow clang versions older than the clang version which caused the problem
+        #compiler.blacklist {clang < 425}
+        
+        # Disallow all clang versions
+        #compiler.blacklist *clang*
+        
+        # switch to /usr/bin/gcc and /usr/bin/g++
+        # closest to SET(CMAKE_CXX_COMPILER g++) removed in the patchfile
+        configure.compiler gcc
+    }
+
     checksums           rmd160  11d21eb50e63776876dccf3a72e19e5de4eec9c2 \
                         sha256  70fe55985ba187a26cce6905c57f66bb9904b33760e3ff30b611697b4bf2fde0
 
@@ -96,13 +113,6 @@
                         -DWITH_LIBWRAP:BOOL=ON \
                         -DWITH_SSL:STRING=bundled
 
-    if {[string match *clang* ${configure.cxx}] &&
-              ${os.major} >= 13} {
-
-        configure.args-append \
-                        -DCMAKE_CXX_FLAGS:STRING="-stdlib=libstdc++"
-    }
-
     post-build {
         set dirs ${worksrcpath}/build_macports
         foreach dir ${dirs} {

Added: trunk/dports/databases/mysql56/files/patch-CMakeLists.txt.diff
===================================================================
--- trunk/dports/databases/mysql56/files/patch-CMakeLists.txt.diff	                        (rev 0)
+++ trunk/dports/databases/mysql56/files/patch-CMakeLists.txt.diff	2014-03-20 00:28:20 UTC (rev 118041)
@@ -0,0 +1,15 @@
+--- a/CMakeLists.txt	2014-01-14 08:38:00.000000000 -0700
++++ b/CMakeLists.txt	2014-03-17 07:59:18.000000000 -0700
+@@ -61,9 +61,9 @@
+  CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel")
+ 
+ # Possibly temporary fix: Clang on 32 bit causes non-debug server to crash
+-IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386")
+-  SET(CMAKE_CXX_COMPILER g++)
+-ENDIF()
++#IF(CMAKE_OSX_ARCHITECTURES MATCHES "i386")
++#  SET(CMAKE_CXX_COMPILER g++)
++#ENDIF()
+ 
+ IF(WITH_DEBUG)
+   SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING ${BUILDTYPE_DOCSTRING} FORCE)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140319/9896a146/attachment.html>