<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[142778] trunk/dports/math/atlas/Portfile</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/142778">142778</a></dd>
<dt>Author</dt> <dd>vince@macports.org</dd>
<dt>Date</dt> <dd>2015-11-22 21:42:14 -0800 (Sun, 22 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>atlas: bump to LAPACK 3.6.0 and hopefully solve some bugs.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathatlasPortfile">trunk/dports/math/atlas/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmathatlasPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/atlas/Portfile (142777 => 142778)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -8,11 +8,11 @@
</span><span class="cx"> license BSD
</span><span class="cx"> name atlas
</span><span class="cx"> version 3.10.2
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><span class="cx"> # additional versions
</span><del>-set lapackversion 3.5.0
</del><ins>+set lapackversion 3.6.0
</ins><span class="cx"> set lapackname lapack
</span><span class="cx"> set atlasdist ${name}${version}${extract.suffix}
</span><span class="cx"> set lapackdist ${lapackname}-${lapackversion}.tgz
</span><span class="lines">@@ -42,19 +42,16 @@
</span><span class="cx"> patch-emit_mm_c.diff \
</span><span class="cx"> patch-makes-Make.lib.diff
</span><span class="cx">
</span><del>-checksums atlas3.10.2.tar.bz2 \
</del><ins>+checksums atlas${version}.tar.bz2 \
</ins><span class="cx"> rmd160 af4099e8bb65f5d771618ca1580f5bc8210f83fe \
</span><span class="cx"> sha256 3aab139b118bf3fcdb4956fbd71676158d713ab0d3bccb2ae1dc3769db22102f \
</span><del>- lapack-3.5.0.tgz \
- rmd160 d803308ef28f3c6cffb051850823395e2cb29b6a \
- sha256 9ad8f0d3f3fb5521db49f2dd716463b8fb2b6bc9dc386a9956b8c6144f726352
</del><ins>+ lapack-${lapackversion}.tgz \
+ rmd160 a92d0d869e42cf5835039b043e613e323b069f04 \
+ sha256 a9a0082c918fe14e377bbd570057616768dca76cbdc713457d8199aaa233ffc3
</ins><span class="cx">
</span><span class="cx"> worksrcdir ATLAS
</span><span class="cx">
</span><del>-set gcc_version 0
-set use_clang ""
-
-variant gcc5 conflicts gcc47 gcc48 gcc49 clang mpclang34 perf\
</del><ins>+variant gcc5 conflicts gcc49 mpclang37 perf\
</ins><span class="cx"> description {build using macports-gcc-5} {
</span><span class="cx">
</span><span class="cx"> configure.compiler macports-gcc-5
</span><span class="lines">@@ -67,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant gcc49 conflicts gcc47 gcc48 gcc5 clang mpclang34 perf\
</del><ins>+variant gcc49 conflicts gcc5 mpclang37 perf\
</ins><span class="cx"> description {build using macports-gcc-4.9} {
</span><span class="cx">
</span><span class="cx"> configure.compiler macports-gcc-4.9
</span><span class="lines">@@ -80,86 +77,43 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant gcc48 conflicts gcc47 gcc49 gcc5 clang mpclang34 perf \
- description {build using macports-gcc-4.8} {
</del><ins>+variant mpclang37 conflicts gcc49 gcc5 perf\
+ description {use mp-clang-3.7 and gfortran} {
</ins><span class="cx">
</span><del>- configure.compiler macports-gcc-4.8
</del><ins>+ configure.compiler macports-clang-3.7
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-if {[variant_isset gcc48]} {
</del><ins>+if {[variant_isset mpclang37]} {
</ins><span class="cx">
</span><del>- 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"
</del><ins>+ set use_clang "37"
</ins><span class="cx"> set gcc_version 0
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant mpclang34 conflicts gcc47 gcc48 gcc49 gcc5 clang perf\
- description {use mp-clang-3.4 and gfortran} {
</del><ins>+# 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
+#}
</ins><span class="cx">
</span><del>- 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
-}
-
</del><span class="cx"> variant nofortran description {Forgo use of fortran compiler} {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -198,29 +152,25 @@
</span><span class="cx"> # If none of the above variants is chosen, make gcc47 the default for
</span><span class="cx"> # up to SSE4.2 (Core i1) capable processors, and XCode-clang for newer
</span><span class="cx">
</span><del>-if {![variant_isset gcc47] && ![variant_isset gcc48] && \
- ![variant_isset gcc49] && ![variant_isset gcc5] && \
- ![variant_isset clang] && \
- ![variant_isset perf] && ![variant_isset mpclang34]} {
</del><ins>+if {![variant_isset gcc49] && ![variant_isset gcc5] && ![variant_isset mpclang37]} {
</ins><span class="cx">
</span><span class="cx"> if {${has_avx} == "no"} {
</span><span class="cx">
</span><span class="cx"> # Defaults to gcc47
</span><del>- default_variants +gcc47
- set gcc_version 47
</del><ins>+ default_variants +gcc5
+ set gcc_version 5
</ins><span class="cx"> set use_clang ""
</span><span class="cx"> } else {
</span><span class="cx">
</span><span class="cx"> # Use an appropriate version of Clang
</span><span class="cx"> set gcc_version 0
</span><del>- if {[vercmp ${xcodeversion} 5.0] >= 0} {
</del><ins>+ if {[vercmp ${xcodeversion} 6.0] >= 0} {
</ins><span class="cx"> # With XCode 5.0+, defaults to Xcode-clang
</span><del>- default_variants +clang
</del><span class="cx"> set use_clang "XCode"
</span><span class="cx"> } else {
</span><del>- # Otherwise use Macports clang 3.4
- default_variants +mpclang34
- set use_clang "34"
</del><ins>+ # Otherwise use Macports clang 3.7
+ default_variants +mpclang37
+ set use_clang "37"
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -432,7 +382,7 @@
</span><span class="cx">
</span><span class="cx"> if {${use_clang} != "" && ${fortran} == 1} {
</span><span class="cx">
</span><del>- if {![variant_isset perf]} {
</del><ins>+# if {![variant_isset perf]} {
</ins><span class="cx"> set gflist [glob -noc ${prefix}/bin/gfortran-mp-*]
</span><span class="cx"> if {[llength ${gflist}] == 0} {
</span><span class="cx">
</span><span class="lines">@@ -451,9 +401,9 @@
</span><span class="cx"> set gcc_version \
</span><span class="cx"> [string replace ${configure.f77} 0 [string length ${prefix}]+[string length bin/gfortran-mp-]]
</span><span class="cx"> }
</span><del>- } else {
- set libgccpath ${prefix}/lib/gcc48
- }
</del><ins>+# } else {
+# set libgccpath ${prefix}/lib/gcc48
+# }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {${fortran} == 1} {
</span><span class="lines">@@ -506,7 +456,7 @@
</span><span class="cx">
</span><span class="cx"> # AVX stuff. GCC compilers cannot use AVX instruction set because the
</span><span class="cx"> # system as(1) is outdated
</span><del>- # Clang 3.4 is fine
</del><ins>+ # Clang 3.7 is fine
</ins><span class="cx">
</span><span class="cx"> if {${has_avx} == "yes" && ${use_clang} == ""} {
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>