Ticket #42943: Portfile.diff

File Portfile.diff, 1.6 KB (added by MarcusCalhoun-Lopez (Marcus Calhoun-Lopez), 11 years ago)
  • Portfile

    old new  
    22# $Id: Portfile 117939 2014-03-17 15:48:34Z pixilla@macports.org $
    33
    44PortSystem          1.0
     5PortGroup           compiler_blacklist_versions 1.0
    56
    67name                mysql56
    78set name_mysql      ${name}
    89version             5.6.16
    910# Set revision_client and revision_server to 0 on version bump.
    10 set revision_client 1
     11set revision_client 2
    1112set revision_server 0
    1213set version_branch  [join [lrange [split ${version} .] 0 1] .]
    1314categories          databases
     
    4041    # and SUPPORTFILESDIR.
    4142    patchfiles-append   patch-scripts-mysql_install_db.pl.in.diff
    4243
     44    # Don't allow mysql to set the compiler to g++
     45    # See http://bazaar.launchpad.net/~mysql/mysql-server/5.6/revision/4223.1.4
     46    # See also #42943
     47    patchfiles-append   patch-CMakeLists.txt.diff
     48    if { (![variant_isset universal] && ${build_arch} eq "i386") || ([variant_isset universal] && [lsearch ${universal_archs} i386] != -1) } {
     49        # Disallow clang versions older than the clang version which caused the problem
     50        #compiler.blacklist {clang < 425}
     51       
     52        # Disallow all clang versions
     53        #compiler.blacklist *clang*
     54       
     55        # switch to /usr/bin/gcc and /usr/bin/g++
     56        # closest to SET(CMAKE_CXX_COMPILER g++) removed in the patchfile
     57        configure.compiler gcc
     58    }
     59
    4360    checksums           rmd160  11d21eb50e63776876dccf3a72e19e5de4eec9c2 \
    4461                        sha256  70fe55985ba187a26cce6905c57f66bb9904b33760e3ff30b611697b4bf2fde0
    4562