<!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>[64567] 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="http://trac.macports.org/changeset/64567">64567</a></dd>
<dt>Author</dt> <dd>jameskyle@macports.org</dd>
<dt>Date</dt> <dd>2010-03-09 07:14:13 -0800 (Tue, 09 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Applied patch to atlas build provided in #23349. Build and Linking verified on intel mac pro 10.6</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathatlasPortfile">trunk/dports/math/atlas/Portfile</a></li>
<li><a href="#trunkdportsmathatlasfilespatchbuildMaketopdiff">trunk/dports/math/atlas/files/patch-build-Make.top.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 (64566 => 64567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/atlas/Portfile 2010-03-09 14:54:03 UTC (rev 64566)
+++ trunk/dports/math/atlas/Portfile 2010-03-09 15:14:13 UTC (rev 64567)
</span><span class="lines">@@ -42,10 +42,8 @@
</span><span class="cx"> rmd160 e8fabba2fdd944afbc02a83599cf45a0d721030d
</span><span class="cx">
</span><span class="cx">
</span><del>-# the following patch corrects extension conventions for osx's dynamic libs
-set make_patch patch-build-Make.top.diff
</del><span class="cx"> use_parallel_build no
</span><del>-build.target build
</del><ins>+build.target build
</ins><span class="cx"> build.dir ${workpath}/${name}-${version}/build
</span><span class="cx">
</span><span class="cx"> destroot.dir ${build.dir}
</span><span class="lines">@@ -167,57 +165,60 @@
</span><span class="cx"> # recursively remove directories
</span><span class="cx"> ui_debug "reinplace for make to recursively remove directories on clean"
</span><span class="cx"> reinplace "s|rm -f|rm -rf|g" ${workpath}/${name}-${version}/build/Makefile
</span><ins>+}
</ins><span class="cx">
</span><del>- ui_debug "patch ${name}-${version}/build/Make.top to install dynamic libs"
- system "cd ${worksrcpath}/build/ && \
- patch -p0 < ${filespath}/${make_patch}"
</del><ins>+proc make_dylib { lib libs } {
+ global destroot prefix myarch
+ system "cd ${destroot}/${prefix}/lib && \
+ ( test ! -e ${lib}.a ||
+ ld -arch ${myarch} -dynamic -dylib -single_module -dead_strip \
+ -x -all_load -L. -L${prefix}/lib/gcc43 -ldylib1.o \
+ -dylib_install_name ${prefix}/lib/${lib}.dylib \
+ ${lib}.a -o ${lib}.dylib ${libs} && rm -f ${lib}.a)"
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-pre-destroot {
</del><ins>+
+post-destroot {
</ins><span class="cx"> # We have to manually create the dylib shared libs as the default build does not do this
</span><ins>+ global myarch
+
</ins><span class="cx"> if {[string equal "${os.arch}" "powerpc"]} {
</span><span class="cx"> if {${my_arch} == "64" } {
</span><span class="cx"> set myarch "ppc64"
</span><span class="cx"> } else {
</span><span class="cx"> set myarch "ppc"
</span><span class="cx"> }
</span><ins>+ } else {
+ if {${my_arch} == "64" } {
+ set myarch "x86_64"
</ins><span class="cx"> } else {
</span><del>- if {${my_arch} == "64" } {
- set myarch "x86_64"
- } else {
- set myarch "i386"
- }
</del><ins>+ set myarch "i386"
</ins><span class="cx"> }
</span><ins>+ }
</ins><span class="cx">
</span><del>- set ld "ld -arch ${myarch} -dynamic -dylib -single_module -dead_strip -x \
- -all_load -L. -L${prefix}/lib/gcc43 -ldylib1.o -dylib_install_name"
</del><ins>+ set ncpu [exec sysctl -n hw.ncpu]
</ins><span class="cx">
</span><del>- system "cd ${workpath}/${name}-${version}/build/lib && \
- ${ld} ${prefix}/lib/libatlas.dylib libatlas.a -o libatlas.dylib \
- -lSystem"
</del><ins>+ make_dylib libatlas { -lSystem }
</ins><span class="cx">
</span><del>- system "cd ${workpath}/${name}-${version}/build/lib && \
- ${ld} ${prefix}/lib/libptcblas.dylib libptcblas.a -o \
- libptcblas.dylib -latlas \
- -lSystem"
</del><ins>+ if {${ncpu} == "1" } {
+ # there are no threaded libraries (libpt*) on single-core machines
+ make_dylib libcblas { -latlas -lSystem }
+ make_dylib libf77blas { -lgfortran -latlas -lSystem }
+ } else {
+ make_dylib libptcblas { -latlas -lSystem }
+ make_dylib libptf77blas { -lgfortran -latlas -lSystem }
</ins><span class="cx">
</span><del>- system "cd ${workpath}/${name}-${version}/build/lib && \
- ${ld} ${prefix}/lib/libptf77blas.dylib \
- libptf77blas.a -o libptf77blas.dylib \
- -lgfortran -latlas -lSystem"
</del><ins>+ # we make soft links to the parallel built libs
+ system "cd ${destroot}${prefix}/lib && \
+ ln -s ./libptcblas.dylib libcblas.dylib && \
+ ln -s ./libptf77blas.dylib libf77blas.dylib"
</ins><span class="cx">
</span><del>- system "cd ${workpath}/${name}-${version}/build/lib && \
- ${ld} ${prefix}/lib/liblapack.dylib liblapack.a -o liblapack.dylib \
- -lptf77blas -lgfortran -lptcblas -latlas -lgcc_s.1 -lSystem"
</del><ins>+ file delete ${destroot}/${prefix}/lib/libcblas.a
+ file delete ${destroot}/${prefix}/lib/libf77blas.a
+ }
</ins><span class="cx">
</span><ins>+ make_dylib liblapack { -lf77blas -lcblas -latlas -lgfortran -lgcc_s.1 -lSystem }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-post-destroot {
- # we make soft links to the parallel built libs
- system "cd ${destroot}${prefix}/lib && \
- ln -sf ./libptcblas.dylib libcblas.dylib && \
- ln -sf ./libptf77blas.dylib libf77blas.dylib"
-}
-
</del><span class="cx"> livecheck.name math-atlas
</span><span class="cx"> livecheck.distname Stable
</span></span></pre></div>
<a id="trunkdportsmathatlasfilespatchbuildMaketopdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/atlas/files/patch-build-Make.top.diff (64566 => 64567)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/atlas/files/patch-build-Make.top.diff 2010-03-09 14:54:03 UTC (rev 64566)
+++ trunk/dports/math/atlas/files/patch-build-Make.top.diff 2010-03-09 15:14:13 UTC (rev 64567)
</span><span class="lines">@@ -1,24 +0,0 @@
</span><del>---- Make.top.old 2009-01-24 15:06:37.000000000 -0800
-+++ Make.top 2009-01-24 15:08:49.000000000 -0800
-@@ -289,14 +289,11 @@
- cp $(INCAdir)/* $(INSTdir)/atlas/.
- - chmod 0644 $(INSTdir)/atlas/*
- install_lib:
-- cp $(LIBdir)/libatlas.a $(INSTdir)/.
-- cp $(LIBdir)/libcblas.a $(INSTdir)/.
-- cp $(LIBdir)/liblapack.a $(INSTdir)/.
-- chmod 0644 $(INSTdir)/libatlas.a $(INSTdir)/liblapack.a \
-- $(INSTdir)/libcblas.a
-- - cp $(LIBdir)/libf77blas.a $(INSTdir)/.
-- - chmod 0644 $(INSTdir)/libf77blas.a
-- - cp $(LIBdir)/libptcblas.a $(INSTdir)/.
-- - cp $(LIBdir)/libptf77blas.a $(INSTdir)/.
-- - chmod 0644 $(INSTdir)/libptcblas.a $(INSTdir)/libptf77blas.a
-+ cp $(LIBdir)/libatlas.dylib $(INSTdir)/.
-+ cp $(LIBdir)/libptcblas.dylib $(INSTdir)/.
-+ cp $(LIBdir)/liblapack.dylib $(INSTdir)/.
-+ chmod 0644 $(INSTdir)/libatlas.dylib $(INSTdir)/liblapack.dylib \
-+ $(INSTdir)/libptcblas.dylib
-+ - cp $(LIBdir)/libptf77blas.dylib $(INSTdir)/.
-+ - chmod 0644 $(INSTdir)/libptf77blas.dylib
-
</del></span></pre>
</div>
</div>
</body>
</html>