[100703] trunk/dports/science/mpich2/Portfile

[eborisch at macports.org]

Revision: 100703
          https://trac.macports.org/changeset/100703
Author:   eborisch at macports.org
Date:     2012-12-20 17:51:54 -0800 (Thu, 20 Dec 2012)
Log Message:
-----------
mpich2[-devel]: Apply config tweak to enable using system clang/ld. Bumped rev as ML users installed without variants will get a different version (clang vs llvm) installed now.

Modified Paths:
--------------
    trunk/dports/science/mpich2/Portfile

Modified: trunk/dports/science/mpich2/Portfile
===================================================================
--- trunk/dports/science/mpich2/Portfile	2012-12-21 01:31:19 UTC (rev 100702)
+++ trunk/dports/science/mpich2/Portfile	2012-12-21 01:51:54 UTC (rev 100703)
@@ -2,12 +2,11 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           compiler_blacklist_versions 1.0
 
 name                mpich2
 set pkgname         mpich2
 version             1.5
-revision            5
+revision            6
 epoch               20121008 
 
 license             BSD
@@ -45,10 +44,6 @@
 conflicts-append    lammpi \
                     openmpi
  
-# Linker for Apple clang version 431.11.66 currently segfaults
-# See https://trac.macports.org/ticket/36654#comment:9
-compiler.blacklist-append   {clang >= 421.11.66}
-
 configure.args      --disable-dependency-tracking \
                     --disable-f77 \
                     --disable-fc \
@@ -94,35 +89,35 @@
 
 variant gcc47 description {
     Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc47 port
-} conflicts gcc43 gcc44 gcc45 gcc46 llvm clang31 {
+} conflicts gcc43 gcc44 gcc45 gcc46 llvm clang clang31 {
     depends_lib-append      port:gcc47
     configure.compiler      macports-gcc-4.7
 }
 
 variant gcc46 description {
     Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc46 port
-} conflicts gcc43 gcc44 gcc45 gcc47 llvm clang31 {
+} conflicts gcc43 gcc44 gcc45 gcc47 llvm clang clang31 {
     depends_lib-append      port:gcc46
     configure.compiler      macports-gcc-4.6
 }
 
 variant gcc45 description {
     Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc45 port
-} conflicts gcc43 gcc44 gcc46 gcc47 llvm clang31 {
+} conflicts gcc43 gcc44 gcc46 gcc47 llvm clang clang31 {
     depends_lib-append      port:gcc45
     configure.compiler      macports-gcc-4.5
 }
 
 variant gcc44 description {
     Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc44 port
-} conflicts gcc43 gcc45 gcc46 gcc47 llvm clang31 {
+} conflicts gcc43 gcc45 gcc46 gcc47 llvm clang clang31 {
     depends_lib-append      port:gcc44
     configure.compiler      macports-gcc-4.4
 }
 
 variant gcc43 description {
     Enable Fortran 77 and Fortran 90 bindings using gfortran from gcc43 port
-} conflicts gcc44 gcc45 gcc46 gcc47 llvm clang31 {
+} conflicts gcc44 gcc45 gcc46 gcc47 llvm clang clang31 {
     depends_lib-append      port:gcc43
     configure.compiler      macports-gcc-4.3
 }
@@ -138,22 +133,19 @@
 
 variant llvm description {
     Use Apple-supplied llvm-gcc
-} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 clang31 {
+} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 clang clang31 {
     configure.compiler      llvm-gcc-4.2
 }
 
-if {[regexp -all -- {\yclang\y} ${compiler.blacklist}] == 0} {
-    # Only expose clang variant if not blacklisted
-    variant clang description {
-        Use Apple-supplied clang
-    } conflicts gcc43 gcc44 gcc45 gcc46 gcc47 llvm clang31 {
-        configure.compiler      clang
-    }
+variant clang description {
+    Use Apple-supplied clang
+} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 llvm clang31 {
+    configure.compiler      clang
 }
 
 variant clang31 description {
     Use clang 3.1 from MacPorts
-} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 llvm {
+} conflicts gcc43 gcc44 gcc45 gcc46 gcc47 llvm clang {
     depends_lib-append      port:clang-3.1
     configure.compiler      clang
     configure.cc            ${prefix}/bin/clang-mp-3.1
@@ -167,12 +159,16 @@
     configure.args-delete   --with-pm=hydra
 }
 
-variant tuned description {Build with more optimizations)} {
+variant tuned description {Build with more optimizations} {
     configure.args-delete       --enable-fast=O2
     configure.args-append       --enable-fast=all \
                                 MPICH2LIB_CFLAGS='-fomit-frame-pointer -O2'
 }
 
+if {${configure.compiler} == "clang"} {
+    configure.env-append    ac_cv_tls=none
+}
+
 livecheck.type      regex
 livecheck.regex     ${pkgname}-(\[0-9.pbrc\]+)${extract.suffix}
 livecheck.url       ${homepage}downloads/index.php?s=downloads
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121220/8f3901a3/attachment.html>