<!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>[122764] 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/122764">122764</a></dd>
<dt>Author</dt> <dd>vince@macports.org</dd>
<dt>Date</dt> <dd>2014-07-29 02:19:25 -0700 (Tue, 29 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Restore some patchfiles that were necessary to build on PPC. Sorry for the flub.</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="#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 (122763 => 122764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/atlas/Portfile 2014-07-29 06:25:07 UTC (rev 122763)
+++ trunk/dports/math/atlas/Portfile 2014-07-29 09:19:25 UTC (rev 122764)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-# $Id$
</del><ins>+$Id$
</ins><span class="cx"> set ports_ignore_different "yes"
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx"> license BSD
</span><span class="cx"> name atlas
</span><span class="cx"> version 3.10.2
</span><ins>+revision 1
</ins><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><span class="cx"> # additional versions
</span><span class="lines">@@ -37,7 +38,9 @@
</span><span class="cx">
</span><span class="cx"> extract.only ${atlasdist}
</span><span class="cx">
</span><del>-patchfiles patch-archinfo_x86_c.diff
</del><ins>+patchfiles patch-archinfo_x86_c.diff \
+ patch-emit_mm_c.diff \
+ patch-makes-Make.lib.diff
</ins><span class="cx">
</span><span class="cx"> checksums atlas3.10.2.tar.bz2 \
</span><span class="cx"> rmd160 af4099e8bb65f5d771618ca1580f5bc8210f83fe \
</span><span class="lines">@@ -774,40 +777,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} {
-#
-# set libdir ${build.dir}/lib
-# reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
-# ${libdir}/Makefile
</del><ins>+post-build {
+ if {${universal} == 0} {
</ins><span class="cx">
</span><ins>+ set libdir ${build.dir}/lib
+ reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
+ ${libdir}/Makefile
+
</ins><span class="cx"> # On mono-processors machines, build libsatlas.dylib only
</span><del>-# 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} {
</del><ins>+ if {${no_threads} == 1} {
</ins><span class="cx">
</span><del>-# set libdir ${worksrcpath}-${arch}/build/lib
-# reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
-# ${libdir}/Makefile
</del><ins>+ system -W ${libdir} "${build.cmd} dylib"
+ } else {
</ins><span class="cx">
</span><ins>+ 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
+
</ins><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="trunkdportsmathatlasfilespatchemit_mm_cdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/math/atlas/files/patch-emit_mm_c.diff (0 => 122764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/atlas/files/patch-emit_mm_c.diff (rev 0)
+++ trunk/dports/math/atlas/files/patch-emit_mm_c.diff 2014-07-29 09:19:25 UTC (rev 122764)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+--- 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++)
+
</ins></span></pre></div>
<a id="trunkdportsmathatlasfilespatchmakesMakelibdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/math/atlas/files/patch-makes-Make.lib.diff (0 => 122764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/atlas/files/patch-makes-Make.lib.diff (rev 0)
+++ trunk/dports/math/atlas/files/patch-makes-Make.lib.diff 2014-07-29 09:19:25 UTC (rev 122764)
</span><span class="lines">@@ -0,0 +1,56 @@
</span><ins>+--- 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)
</ins></span></pre>
</div>
</div>
</body>
</html>