Revision: 111736 https://trac.macports.org/changeset/111736 Author: vince@macports.org Date: 2013-09-30 04:14:17 -0700 (Mon, 30 Sep 2013) Log Message: ----------- Okay. Should be fine now. Reverting to 3.10.1 and applying the patch Modified Paths: -------------- trunk/dports/math/atlas/Portfile Modified: trunk/dports/math/atlas/Portfile =================================================================== --- trunk/dports/math/atlas/Portfile 2013-09-30 11:11:19 UTC (rev 111735) +++ trunk/dports/math/atlas/Portfile 2013-09-30 11:14:17 UTC (rev 111736) @@ -35,13 +35,13 @@ ${lapackdist}:lapack patchfiles patch-emit_mm_c.diff \ - patch-ATL_cmm4x4x128_av_c.diff\ - patch-archinfo_x86_c.diff + patch-ATL_cmm4x4x128_av_c.diff +# patch-archinfo_x86_c.diff\ # patch-tfc_c.diff -checksums atlas3.11.13.tar.bz2 \ - rmd160 d7872e0210f390001da88c19624396ce492ed7a3 \ - sha256 0ffdf01641214c519ce99515c5ef3c47c53b9a6ecd841a09d350eab196baf3c7\ +checksums atlas3.10.1.tar.bz2 \ + rmd160 67f928ad900caa300b23e2f824b8a495f416c8d6 \ + sha256 a215b492204aae0205f4028e7c4076492a5d6a564f8f859ff062fd79587bcc86 \ lapack-3.4.2.tgz \ rmd160 8740c35c9a85b71424fe1ffeed192256aebeb431 \ sha256 60a65daaf16ec315034675942618a2230521ea7adf85eea788ee54841072faf0 @@ -92,6 +92,11 @@ variant clang conflicts gcc46 gcc47 gcc48 mpclang33 \ description {use XCode clang and gfortran} { + pre-fetch { + return -code error "Use of clang is temporarily disabled.\ + Please choose gcc47 instead." + } + configure.compiler clang } @@ -226,8 +231,21 @@ -fno-schedule-insns2 -fPIC" # Clang - set clang_flags "-O3 -fomit-frame-pointer -fPIC" + if {${use_clang} == "XCode" } { + pre-fetch { + ui_warn "Compiling Atlas with this version of clang is\ + likely *NOT* to work. Please use clang-3.3 or\ + higher." + } + set clang_flags "-O3 -fomit-frame-pointer -fPIC" + } else { + + # Clang 3.3 – Use loop and straight vectorizer + set clang_flags "-O3 -fomit-frame-pointer -fPIC" + + } + # Vectorizing unit flags if {${has_fma} == "yes"} { @@ -235,11 +253,12 @@ set gvct_flag "-msse4.2" # downgrade FMA to AVX for the time being set cvct_flag "-mavx" - if {${use_clang} != ""} { + configure.args-append -A 26 -V 480 - } else { - # No AVX when using GCC + } else { + + # No AVX when using GCC 4.x configure.args-append -A 26 -V 448 } } elseif {${has_avx2} == "yes"} {