[142778] trunk/dports/math/atlas/Portfile
vince at macports.org
vince at macports.org
Sat Dec 12 07:11:47 PST 2015
Revision: 142778
https://trac.macports.org/changeset/142778
Author: vince at macports.org
Date: 2015-11-22 21:42:14 -0800 (Sun, 22 Nov 2015)
Log Message:
-----------
atlas: bump to LAPACK 3.6.0 and hopefully solve some bugs.
Modified Paths:
--------------
trunk/dports/math/atlas/Portfile
Modified: trunk/dports/math/atlas/Portfile
===================================================================
--- trunk/dports/math/atlas/Portfile 2015-11-23 04:53:39 UTC (rev 142777)
+++ trunk/dports/math/atlas/Portfile 2015-11-23 05:42:14 UTC (rev 142778)
@@ -8,11 +8,11 @@
license BSD
name atlas
version 3.10.2
-revision 1
+revision 2
use_bzip2 yes
# additional versions
-set lapackversion 3.5.0
+set lapackversion 3.6.0
set lapackname lapack
set atlasdist ${name}${version}${extract.suffix}
set lapackdist ${lapackname}-${lapackversion}.tgz
@@ -42,19 +42,16 @@
patch-emit_mm_c.diff \
patch-makes-Make.lib.diff
-checksums atlas3.10.2.tar.bz2 \
+checksums atlas${version}.tar.bz2 \
rmd160 af4099e8bb65f5d771618ca1580f5bc8210f83fe \
sha256 3aab139b118bf3fcdb4956fbd71676158d713ab0d3bccb2ae1dc3769db22102f \
- lapack-3.5.0.tgz \
- rmd160 d803308ef28f3c6cffb051850823395e2cb29b6a \
- sha256 9ad8f0d3f3fb5521db49f2dd716463b8fb2b6bc9dc386a9956b8c6144f726352
+ lapack-${lapackversion}.tgz \
+ rmd160 a92d0d869e42cf5835039b043e613e323b069f04 \
+ sha256 a9a0082c918fe14e377bbd570057616768dca76cbdc713457d8199aaa233ffc3
worksrcdir ATLAS
-set gcc_version 0
-set use_clang ""
-
-variant gcc5 conflicts gcc47 gcc48 gcc49 clang mpclang34 perf\
+variant gcc5 conflicts gcc49 mpclang37 perf\
description {build using macports-gcc-5} {
configure.compiler macports-gcc-5
@@ -67,7 +64,7 @@
}
-variant gcc49 conflicts gcc47 gcc48 gcc5 clang mpclang34 perf\
+variant gcc49 conflicts gcc5 mpclang37 perf\
description {build using macports-gcc-4.9} {
configure.compiler macports-gcc-4.9
@@ -80,86 +77,43 @@
}
-variant gcc48 conflicts gcc47 gcc49 gcc5 clang mpclang34 perf \
- description {build using macports-gcc-4.8} {
+variant mpclang37 conflicts gcc49 gcc5 perf\
+ description {use mp-clang-3.7 and gfortran} {
- configure.compiler macports-gcc-4.8
+ configure.compiler macports-clang-3.7
}
-if {[variant_isset gcc48]} {
+if {[variant_isset mpclang37]} {
- set gcc_version 48
- set use_clang ""
-}
-
-variant gcc47 conflicts gcc48 gcc49 gcc5 clang mpclang34 perf \
- description {build using macports-gcc-4.7} {
-
- configure.compiler macports-gcc-4.7
-}
-
-if {[variant_isset gcc47]} {
-
- set gcc_version 47
- set use_clang ""
-}
-
-
-variant clang conflicts gcc47 gcc48 gcc49 gcc5 mpclang34 \
- description {use XCode clang and gfortran} {
-
- pre-fetch {
- if {[vercmp ${xcodeversion} 5.0] < 0} {
- return -code error "This clang version is not supported.\
- Please upgrade to Xcode 5."
- }
- }
-
- configure.compiler clang
-}
-
-if {[variant_isset clang]} {
-
- set use_clang "XCode"
+ set use_clang "37"
set gcc_version 0
}
-variant mpclang34 conflicts gcc47 gcc48 gcc49 gcc5 clang perf\
- description {use mp-clang-3.4 and gfortran} {
+# Disabled until further notice
+#variant perf conflicts gcc47 gcc48 gcc49 gcc5 mpclang34 clang \
+# description {Uses clang-mp-3.4 for C and dragonegg-3.4 for Fortran} {
+#
+# if {[vercmp ${xcodeversion} 5.0] < 0} {
+# configure.compiler macports-clang-3.4
+# } else {
+# set use_clang "XCode"
+# set gcc_version 0
+# }
+#
+# depends_build-append port:dragonegg-3.4-gcc-4.8
+# configure.f77 ${prefix}/bin/dragonegg-3.4-gfortran-mp-4.8
+#
+# set clang_flags "-O3 -fPIC -fomit-frame-pointer"
+# set gcc_flags "${clang_flags} \
+# -specs=${prefix}/libexec/dragonegg/llvm34gcc48-integrated-as.specs"
+#}
+#
+#if {[variant_isset perf]} {
+#
+# set use_clang "34"
+# set gcc_version 48
+#}
- configure.compiler macports-clang-3.4
-}
-
-if {[variant_isset mpclang34]} {
-
- set use_clang "34"
- set gcc_version 0
-}
-
-variant perf conflicts gcc47 gcc48 gcc49 gcc5 mpclang34 clang \
- description {Uses clang-mp-3.4 for C and dragonegg-3.4 for Fortran} {
-
- if {[vercmp ${xcodeversion} 5.0] < 0} {
- configure.compiler macports-clang-3.4
- } else {
- set use_clang "XCode"
- set gcc_version 0
- }
-
- depends_build-append port:dragonegg-3.4-gcc-4.8
- configure.f77 ${prefix}/bin/dragonegg-3.4-gfortran-mp-4.8
-
- set clang_flags "-O3 -fPIC -fomit-frame-pointer"
- set gcc_flags "${clang_flags} \
- -specs=${prefix}/libexec/dragonegg/llvm34gcc48-integrated-as.specs"
-}
-
-if {[variant_isset perf]} {
-
- set use_clang "34"
- set gcc_version 48
-}
-
variant nofortran description {Forgo use of fortran compiler} {
}
@@ -198,29 +152,25 @@
# If none of the above variants is chosen, make gcc47 the default for
# up to SSE4.2 (Core i1) capable processors, and XCode-clang for newer
-if {![variant_isset gcc47] && ![variant_isset gcc48] && \
- ![variant_isset gcc49] && ![variant_isset gcc5] && \
- ![variant_isset clang] && \
- ![variant_isset perf] && ![variant_isset mpclang34]} {
+if {![variant_isset gcc49] && ![variant_isset gcc5] && ![variant_isset mpclang37]} {
if {${has_avx} == "no"} {
# Defaults to gcc47
- default_variants +gcc47
- set gcc_version 47
+ default_variants +gcc5
+ set gcc_version 5
set use_clang ""
} else {
# Use an appropriate version of Clang
set gcc_version 0
- if {[vercmp ${xcodeversion} 5.0] >= 0} {
+ if {[vercmp ${xcodeversion} 6.0] >= 0} {
# With XCode 5.0+, defaults to Xcode-clang
- default_variants +clang
set use_clang "XCode"
} else {
- # Otherwise use Macports clang 3.4
- default_variants +mpclang34
- set use_clang "34"
+ # Otherwise use Macports clang 3.7
+ default_variants +mpclang37
+ set use_clang "37"
}
}
}
@@ -432,7 +382,7 @@
if {${use_clang} != "" && ${fortran} == 1} {
- if {![variant_isset perf]} {
+# if {![variant_isset perf]} {
set gflist [glob -noc ${prefix}/bin/gfortran-mp-*]
if {[llength ${gflist}] == 0} {
@@ -451,9 +401,9 @@
set gcc_version \
[string replace ${configure.f77} 0 [string length ${prefix}]+[string length bin/gfortran-mp-]]
}
- } else {
- set libgccpath ${prefix}/lib/gcc48
- }
+# } else {
+# set libgccpath ${prefix}/lib/gcc48
+# }
}
if {${fortran} == 1} {
@@ -506,7 +456,7 @@
# AVX stuff. GCC compilers cannot use AVX instruction set because the
# system as(1) is outdated
- # Clang 3.4 is fine
+ # Clang 3.7 is fine
if {${has_avx} == "yes" && ${use_clang} == ""} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/5111e26c/attachment.html>
More information about the macports-changes
mailing list