<!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>[122619] trunk/dports/math/atlas</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/122619">122619</a></dd>
<dt>Author</dt> <dd>vince@macports.org</dd>
<dt>Date</dt> <dd>2014-07-24 23:05:14 -0700 (Thu, 24 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Bump to latest stable. Remove the clang33 option that hangs with some kind of CPU (Corei7) and makes Apple clang the default.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathatlasPortfile">trunk/dports/math/atlas/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmathatlasfilespatcharchinfo_x86_cdiff">trunk/dports/math/atlas/files/patch-archinfo_x86_c.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsmathatlasfilespatchATL_cmm4x4x128_av_cdiff">trunk/dports/math/atlas/files/patch-ATL_cmm4x4x128_av_c.diff</a></li>
<li><a href="#trunkdportsmathatlasfilespatchemit_mm_cdiff">trunk/dports/math/atlas/files/patch-emit_mm_c.diff</a></li>
<li><a href="#trunkdportsmathatlasfilespatchmakesMakelibdiff">trunk/dports/math/atlas/files/patch-makes-Make.lib.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmathatlasPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/atlas/Portfile (122618 => 122619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/atlas/Portfile 2014-07-24 23:31:36 UTC (rev 122618)
+++ trunk/dports/math/atlas/Portfile 2014-07-25 06:05:14 UTC (rev 122619)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> # $Id$
</span><ins>+set ports_ignore_different "yes"
</ins><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup muniversal 1.0
</span><span class="lines">@@ -6,12 +7,11 @@
</span><span class="cx"> categories math
</span><span class="cx"> license BSD
</span><span class="cx"> name atlas
</span><del>-version 3.10.1
-revision 5
</del><ins>+version 3.10.2
</ins><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><span class="cx"> # additional versions
</span><del>-set lapackversion 3.4.2
</del><ins>+set lapackversion 3.5.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">@@ -29,7 +29,7 @@
</span><span class="cx">
</span><span class="cx"> homepage http://math-atlas.sourceforge.net/
</span><span class="cx">
</span><del>-master_sites sourceforge:project/math-atlas/Stable/${version}:atlas \
</del><ins>+master_sites sourceforge:http://downloads.sourceforge.net/project/math-atlas/Stable/${version} \
</ins><span class="cx"> http://www.netlib.org/lapack:lapack
</span><span class="cx">
</span><span class="cx"> distfiles ${atlasdist}:atlas \
</span><span class="lines">@@ -37,26 +37,37 @@
</span><span class="cx">
</span><span class="cx"> extract.only ${atlasdist}
</span><span class="cx">
</span><del>-patchfiles patch-emit_mm_c.diff \
- patch-ATL_cmm4x4x128_av_c.diff \
- patch-makes-Make.lib.diff
</del><ins>+patchfiles patch-archinfo_x86_c.diff
</ins><span class="cx">
</span><del>-checksums ${atlasdist} \
- rmd160 67f928ad900caa300b23e2f824b8a495f416c8d6 \
- sha256 a215b492204aae0205f4028e7c4076492a5d6a564f8f859ff062fd79587bcc86 \
- ${lapackdist} \
- rmd160 8740c35c9a85b71424fe1ffeed192256aebeb431 \
- sha256 60a65daaf16ec315034675942618a2230521ea7adf85eea788ee54841072faf0
</del><ins>+checksums atlas3.10.2.tar.bz2 \
+ rmd160 af4099e8bb65f5d771618ca1580f5bc8210f83fe \
+ sha256 3aab139b118bf3fcdb4956fbd71676158d713ab0d3bccb2ae1dc3769db22102f \
+ lapack-3.5.0.tgz \
+ rmd160 d803308ef28f3c6cffb051850823395e2cb29b6a \
+ sha256 9ad8f0d3f3fb5521db49f2dd716463b8fb2b6bc9dc386a9956b8c6144f726352
</ins><span class="cx">
</span><span class="cx"> worksrcdir ATLAS
</span><span class="cx">
</span><del>-compiler.blacklist macports-clang-3.1 macports-clang-3.0 \
- macports-clang-2.9
</del><ins>+compiler.blacklist macports-clang-3.2 macports-clang-3.1 \
+ macports-clang-3.0 macports-clang-2.9
</ins><span class="cx">
</span><span class="cx"> set gcc_version 0
</span><span class="cx"> set use_clang ""
</span><span class="cx">
</span><del>-variant gcc48 conflicts gcc46 gcc47 clang mpclang33 perf \
</del><ins>+variant gcc49 conflicts gcc47 gcc48 clang mpclang34 perf\
+ description {build using macports-gcc-4.9} {
+
+ configure.compiler macports-gcc-4.9
+}
+
+if {[variant_isset gcc49]} {
+
+ set gcc_version 49
+ set use_clang ""
+
+}
+
+variant gcc48 conflicts gcc47 gcc49 clang mpclang34 perf \
</ins><span class="cx"> description {build using macports-gcc-4.8} {
</span><span class="cx">
</span><span class="cx"> configure.compiler macports-gcc-4.8
</span><span class="lines">@@ -68,7 +79,7 @@
</span><span class="cx"> set use_clang ""
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant gcc47 conflicts gcc46 gcc48 clang mpclang33 perf \
</del><ins>+variant gcc47 conflicts gcc48 gcc49 clang mpclang34 perf \
</ins><span class="cx"> description {build using macports-gcc-4.7} {
</span><span class="cx">
</span><span class="cx"> configure.compiler macports-gcc-4.7
</span><span class="lines">@@ -80,20 +91,8 @@
</span><span class="cx"> set use_clang ""
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant gcc46 conflicts gcc47 gcc48 clang mpclang33 perf\
- description {build using macports-gcc-4.6} {
</del><span class="cx">
</span><del>- configure.compiler macports-gcc-4.6
-}
-
-if {[variant_isset gcc46]} {
-
- set gcc_version 46
- set use_clang ""
-
-}
-
-variant clang conflicts gcc46 gcc47 gcc48 mpclang33 \
</del><ins>+variant clang conflicts gcc47 gcc48 gcc49 mpclang34 \
</ins><span class="cx"> description {use XCode clang and gfortran} {
</span><span class="cx">
</span><span class="cx"> pre-fetch {
</span><span class="lines">@@ -112,33 +111,39 @@
</span><span class="cx"> set gcc_version 0
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant mpclang33 conflicts gcc46 gcc47 gcc48 clang perf\
- description {use mp-clang-3.3 and gfortran} {
</del><ins>+variant mpclang34 conflicts gcc47 gcc48 gcc49 clang perf\
+ description {use mp-clang-3.4 and gfortran} {
</ins><span class="cx">
</span><del>- configure.compiler macports-clang-3.3
</del><ins>+ configure.compiler macports-clang-3.4
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-if {[variant_isset mpclang33]} {
</del><ins>+if {[variant_isset mpclang34]} {
</ins><span class="cx">
</span><del>- set use_clang "33"
</del><ins>+ set use_clang "34"
</ins><span class="cx"> set gcc_version 0
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant perf conflicts gcc46 gcc47 gcc48 mpclang33 clang \
- description {Uses clang-mp-3.3 for C and dragonegg-3.3 for Fortran} {
</del><ins>+variant perf conflicts gcc47 gcc48 gcc49 mpclang34 clang \
+ description {Uses clang-mp-3.4 for C and dragonegg-3.4 for Fortran} {
</ins><span class="cx">
</span><del>- configure.compiler macports-clang-3.3
- depends_build-append port:dragonegg-3.3-gcc-4.8
- configure.f77 ${prefix}/bin/dragonegg-3.3-gfortran-mp-4.8
</del><ins>+ if {[vercmp ${xcodeversion} 5.0] < 0} {
+ configure.compiler macports-clang-3.4
+ } else {
+ set use_clang "XCode"
+ set gcc_version 0
+ }
</ins><span class="cx">
</span><ins>+ depends_build-append port:dragonegg-3.4-gcc-4.8
+ configure.f77 ${prefix}/bin/dragonegg-3.4-gfortran-mp-4.8
+
</ins><span class="cx"> set clang_flags "-O3 -fPIC -fomit-frame-pointer"
</span><span class="cx"> set gcc_flags "${clang_flags} \
</span><del>- -specs=${prefix}/libexec/dragonegg/llvm33gcc48-integrated-as.specs"
</del><ins>+ -specs=${prefix}/libexec/dragonegg/llvm34gcc48-integrated-as.specs"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {[variant_isset perf]} {
</span><span class="cx">
</span><del>- set use_clang "33"
</del><ins>+ set use_clang "34"
</ins><span class="cx"> set gcc_version 48
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -178,11 +183,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # If none of the above variants is chosen, make gcc47 the default for
</span><del>-# up to SSE4.2 (Core i1) capable processors, and mp-clang-3.3 for newer
</del><ins>+# up to SSE4.2 (Core i1) capable processors, and XCode-clang for newer
</ins><span class="cx">
</span><del>-if {![variant_isset gcc46] && ![variant_isset gcc47] && \
- ![variant_isset gcc48] && ![variant_isset clang] && \
- ![variant_isset perf] && ![variant_isset mpclang33]} {
</del><ins>+if {![variant_isset gcc47] && ![variant_isset gcc48] && \
+ ![variant_isset gcc49] && ![variant_isset clang] && \
+ ![variant_isset perf] && ![variant_isset mpclang34]} {
</ins><span class="cx">
</span><span class="cx"> if {${has_avx} == "no"} {
</span><span class="cx">
</span><span class="lines">@@ -191,11 +196,18 @@
</span><span class="cx"> set gcc_version 47
</span><span class="cx"> set use_clang ""
</span><span class="cx"> } else {
</span><del>-
- # Defaults to clang-mp-3.3
- default_variants +mpclang33
- set gcc_version 0
- set use_clang "33"
</del><ins>+
+ # Use an appropriate version of Clang
+ set gcc_version 0
+ if {[vercmp ${xcodeversion} 5.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"
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -245,10 +257,10 @@
</span><span class="cx"> # Only Clang handles AVX+ correctly
</span><span class="cx"> set gvct_flag "-msse4.2"
</span><span class="cx"> # downgrade FMA to AVX for the time being
</span><del>- set cvct_flag "-mavx"
</del><ins>+ set cvct_flag "-mfma"
</ins><span class="cx"> if {${use_clang} != ""} {
</span><span class="cx">
</span><del>- configure.args-append -A 26 -V 480
</del><ins>+ configure.args-append -A 28 -V 456
</ins><span class="cx"> } else {
</span><span class="cx">
</span><span class="cx"> # No AVX when using GCC 4.x
</span><span class="lines">@@ -425,6 +437,8 @@
</span><span class="cx"> set gcc_version \
</span><span class="cx"> [join [split [string range ${configure.f77} end-2 end] "."] ""]
</span><span class="cx"> }
</span><ins>+ } else {
+ set libgccpath ${prefix}/lib/gcc48
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -432,7 +446,7 @@
</span><span class="cx">
</span><span class="cx"> # Output the F77 selected compiler
</span><span class="cx"> if {[variant_isset perf]} {
</span><del>- ui_msg "Using dragonegg-3.3-gfortran-mp-4.8 as Fortran compiler."
</del><ins>+ ui_msg "Using dragonegg-3.4-gfortran-mp-4.8 as Fortran compiler."
</ins><span class="cx"> } else {
</span><span class="cx"> ui_msg "Selected F77 compiler: gfortran${gcc_version}"
</span><span class="cx"> }
</span><span class="lines">@@ -478,7 +492,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.3 is fine
</del><ins>+ # Clang 3.4 is fine
</ins><span class="cx">
</span><span class="cx"> if {${has_avx} == "yes" && ${use_clang} == ""} {
</span><span class="cx">
</span><span class="lines">@@ -760,40 +774,40 @@
</span><span class="cx"> build.target build
</span><span class="cx"> build.dir ${worksrcpath}/build
</span><span class="cx">
</span><del>-post-build {
- if {${universal} == 0} {
</del><ins>+#post-build {
+# if {${universal} == 0} {
+#
+# set libdir ${build.dir}/lib
+# reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
+# ${libdir}/Makefile
</ins><span class="cx">
</span><del>- set libdir ${build.dir}/lib
- reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
- ${libdir}/Makefile
-
</del><span class="cx"> # On mono-processors machines, build libsatlas.dylib only
</span><del>- if {${no_threads} == 1} {
</del><ins>+# if {${no_threads} == 1} {
+#
+# system -W ${libdir} "${build.cmd} dylib"
+# } else {
+#
+# system -W ${libdir} "${build.cmd} shared_all"
+# }
+# } else {
+#
+# foreach arch ${universal_archs_to_use} {
</ins><span class="cx">
</span><del>- system -W ${libdir} "${build.cmd} dylib"
- } else {
</del><ins>+# set libdir ${worksrcpath}-${arch}/build/lib
+# reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
+# ${libdir}/Makefile
</ins><span class="cx">
</span><del>- system -W ${libdir} "${build.cmd} shared_all"
- }
- } else {
-
- foreach arch ${universal_archs_to_use} {
-
- set libdir ${worksrcpath}-${arch}/build/lib
- reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
- ${libdir}/Makefile
-
</del><span class="cx"> # Same as above
</span><del>- if {${no_threads} == 1} {
</del><ins>+# if {${no_threads} == 1} {
</ins><span class="cx">
</span><del>- system -W ${libdir} "${build.cmd} dylib"
- } else {
</del><ins>+# system -W ${libdir} "${build.cmd} dylib"
+# } else {
</ins><span class="cx">
</span><del>- system -W ${libdir} "${build.cmd} shared_all"
- }
- }
- }
-}
</del><ins>+# system -W ${libdir} "${build.cmd} shared_all"
+# }
+# }
+# }
+#}
</ins><span class="cx">
</span><span class="cx"> destroot.dir ${build.dir}
</span><span class="cx"> destroot.destdir DESTDIR=${destroot}${prefix}
</span></span></pre></div>
<a id="trunkdportsmathatlasfilespatchATL_cmm4x4x128_av_cdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/math/atlas/files/patch-ATL_cmm4x4x128_av_c.diff (122618 => 122619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/atlas/files/patch-ATL_cmm4x4x128_av_c.diff 2014-07-24 23:31:36 UTC (rev 122618)
+++ trunk/dports/math/atlas/files/patch-ATL_cmm4x4x128_av_c.diff 2014-07-25 06:05:14 UTC (rev 122619)
</span><span class="lines">@@ -1,11 +0,0 @@
</span><del>---- tune/blas/gemm/CASES/ATL_cmm4x4x128_av.c.orig 2012-12-14 12:32:46.000000000 +0100
-+++ tune/blas/gemm/CASES/ATL_cmm4x4x128_av.c 2012-12-14 12:32:55.000000000 +0100
-@@ -1321,7 +1321,7 @@
- #endif
- vmaddfp vC01, vA0, vB1, vC01
- #ifdef BETAX
-- dcbtst 0, pBETA, 0
-+ dcbtst 0, pBETA
- #endif
- vmaddfp vC11, vA1, vB1, vC11
- vmaddfp vC21, vA2, vB1, vC21
</del></span></pre></div>
<a id="trunkdportsmathatlasfilespatcharchinfo_x86_cdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/math/atlas/files/patch-archinfo_x86_c.diff (0 => 122619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/atlas/files/patch-archinfo_x86_c.diff (rev 0)
+++ trunk/dports/math/atlas/files/patch-archinfo_x86_c.diff 2014-07-25 06:05:14 UTC (rev 122619)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+--- CONFIG/src/backend/archinfo_x86.c.old 2014-07-17 21:47:57.000000000 +0200
++++ CONFIG/src/backend/archinfo_x86.c 2014-07-17 21:48:42.000000000 +0200
+@@ -342,6 +342,7 @@
+ break;
+ case 0x2D:
+ case 0x3A:
++ case 0x3E:
+ case 0x2A:
+ iret = IntCorei2;
+ break;
</ins></span></pre></div>
<a id="trunkdportsmathatlasfilespatchemit_mm_cdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/math/atlas/files/patch-emit_mm_c.diff (122618 => 122619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/atlas/files/patch-emit_mm_c.diff 2014-07-24 23:31:36 UTC (rev 122618)
+++ trunk/dports/math/atlas/files/patch-emit_mm_c.diff 2014-07-25 06:05:14 UTC (rev 122619)
</span><span class="lines">@@ -1,15 +0,0 @@
</span><del>---- tune/blas/gemm/emit_mm.c.orig 2012-12-10 13:59:14.000000000 +0100
-+++ tune/blas/gemm/emit_mm.c 2012-12-10 13:59:59.000000000 +0100
-@@ -2688,10 +2688,7 @@
- {
- if (wp->CC[0]) /* need non-default compilation rule */
- {
-- char *comp = (wp->CC[0] == 'g' && wp->CC[1] == 'c'
-- && wp->CC[2] == 'c' &&
-- (wp->CC[3] == '\0' || wp->CC[3] == ' '))
-- ? "$(GOODGCC)" : wp->CC;
-+ char *comp = "$(GOODGCC)";
- for (j=0; j < nbetas; j++)
- {
- for(k=0; k < wp->ncomps; k++)
-
</del></span></pre></div>
<a id="trunkdportsmathatlasfilespatchmakesMakelibdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/math/atlas/files/patch-makes-Make.lib.diff (122618 => 122619)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/atlas/files/patch-makes-Make.lib.diff 2014-07-24 23:31:36 UTC (rev 122618)
+++ trunk/dports/math/atlas/files/patch-makes-Make.lib.diff 2014-07-25 06:05:14 UTC (rev 122619)
</span><span class="lines">@@ -1,56 +0,0 @@
</span><del>---- makes/Make.lib.orig 2013-01-08 12:15:41.000000000 -0600
-+++ makes/Make.lib 2013-11-24 02:11:17.000000000 -0600
-@@ -242,7 +242,7 @@
- LIBINSTdir="$(LIBINSTdir)"
-
- # =======================================================================
--# The following commands are to build dynamib libraries on OS X (in BETA)
-+# The following commands are to build dynamic libraries on OS X (in BETA)
- # =======================================================================
- dylib :
- rm -rf $(tmpd) ; mkdir $(tmpd)
-@@ -250,7 +250,7 @@
- cd $(tmpd) ; ar x ../libf77blas.a
- cd $(tmpd) ; ar x ../libcblas.a
- cd $(tmpd) ; ar x ../libatlas.a
-- cd $(tmpd) ; $(LIBTOOL) -dynamic -o ../libsatlas.dylib \
-+ cd $(tmpd) ; $(LIBTOOL) -dynamiclib -o ../libsatlas.dylib \
- -install_name $(LIBINSTdir)/libsatlas.dylib -current_version $(VER) \
- -compatibility_version $(VER) *.o $(LIBS) $(F77SYSLIB)
- rm -rf $(tmpd)
-@@ -260,7 +260,7 @@
- cd $(tmpd) ; ar x ../libptf77blas.a
- cd $(tmpd) ; ar x ../libptcblas.a
- cd $(tmpd) ; ar x ../libatlas.a
-- cd $(tmpd) ; $(LIBTOOL) -dynamic -o ../libtatlas.dylib \
-+ cd $(tmpd) ; $(LIBTOOL) -dynamiclib -o ../libtatlas.dylib \
- -install_name $(LIBINSTdir)/libtatlas.dylib -current_version $(VER) \
- -compatibility_version $(VER) *.o $(LIBS) $(F77SYSLIB)
- rm -rf $(tmpd)
-@@ -269,7 +269,7 @@
- cd $(tmpd) ; ar x ../libclapack.a
- cd $(tmpd) ; ar x ../libcblas.a
- cd $(tmpd) ; ar x ../libatlas.a
-- cd $(tmpd) ; $(LIBTOOL) -dynamic -o ../libsatlas.dylib \
-+ cd $(tmpd) ; $(LIBTOOL) -dynamiclib -o ../libsatlas.dylib \
- -install_name $(LIBINSTdir)/libsatlas.dylib -current_version $(VER) \
- -compatibility_version $(VER) *.o $(LIBS)
- rm -rf $(tmpd)
-@@ -278,7 +278,7 @@
- cd $(tmpd) ; ar x ../libptclapack.a
- cd $(tmpd) ; ar x ../libptcblas.a
- cd $(tmpd) ; ar x ../libatlas.a
-- cd $(tmpd) ; $(LIBTOOL) -dynamic -o ../libtatlas.dylib \
-+ cd $(tmpd) ; $(LIBTOOL) -dynamiclib -o ../libtatlas.dylib \
- -install_name $(LIBINSTdir)/libtatlas.dylib -current_version $(VER) \
- -compatibility_version $(VER) *.o $(LIBS)
- rm -rf $(tmpd)
-@@ -287,7 +287,7 @@
- rm -rf $(tmpd) ; mkdir $(tmpd)
- cd $(tmpd) ; ar x ../liblapack.a
- rm -f $(tmpd)/*C2F $(tmpd)/*f77wrap*
-- cd $(tmpd) ; libtool -dynamic -o ../libclapack.dylib \
-+ cd $(tmpd) ; libtool -dynamiclib -o ../libclapack.dylib \
- -install_name $(LIBINSTdir)/libclapack.dylib \
- -compatibility_version $(VER) -current_version $(VER) \
- *.o ../libcblas.dylib ../libatlas.dylib $(LIBS)
</del></span></pre>
</div>
</div>
</body>
</html>