<!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>[143471] trunk/dports/python/py-numpy/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/143471">143471</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2015-12-12 16:47:03 -0800 (Sat, 12 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-numpy: allow universal builds for all compilers (#42416)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpynumpyPortfile">trunk/dports/python/py-numpy/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpynumpyPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-numpy/Portfile (143470 => 143471)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-numpy/Portfile 2015-12-13 00:38:42 UTC (rev 143470)
+++ trunk/dports/python/py-numpy/Portfile 2015-12-13 00:47:03 UTC (rev 143471)
</span><span class="lines">@@ -19,14 +19,24 @@
</span><span class="cx"> checksums rmd160 8635b0d5e9e1744dd444927cbcfc7be29ffeaad7 \
</span><span class="cx"> sha256 53425e0f53900f9206f0f71f7209524011c0e5140cfda0ce6b2147272f395723
</span><span class="cx">
</span><ins>+if {${name} ne ${subport}} {
+ # the python PortGroup puts compiler names in build.env and destroot.env
+ # for this to be done correctly, the following must be located before python.versions
+ pre-build { set_compilers }
+ pre-destroot { set_compilers }
+}
+
</ins><span class="cx"> python.versions 26 27 33 34 35
</span><span class="cx">
</span><span class="cx"> # respect ${build_arch} value
</span><span class="cx"> compilers.clear_archflags no
</span><span class="cx">
</span><ins>+# http://trac.macports.org/ticket/34562
+python.consistent_destroot yes
+
</ins><span class="cx"> # TODO: Fix the +universal variant. This port is a fairly deep dependency and needs to be able to support +universal.
</span><span class="cx"> # https://trac.macports.org/ticket/48263
</span><del>-universal_variant no
</del><ins>+#universal_variant no
</ins><span class="cx">
</span><span class="cx"> if {${name} ne ${subport}} {
</span><span class="cx"> compilers.setup -dragonegg -gcc44 -gcc45 -gcc46 -g95
</span><span class="lines">@@ -44,25 +54,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> pre-destroot {
</span><del>- # http://trac.macports.org/ticket/34562
- destroot.env-append \
- CC="${configure.cc}" \
- CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
- CXX="${configure.cxx}" \
- CXXFLAGS="${configure.cxxflags} [get_canonical_archflags cxx]" \
- OBJC="${configure.objc}" \
- OBJCFLAGS="${configure.objcflags} [get_canonical_archflags objc]" \
- LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
-
</del><span class="cx"> destroot.env-append ARCHFLAGS="[get_canonical_archflags ld]"
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant atlas description conflicts openblas {Use MacPorts ATLAS Libraries} {
</span><span class="cx"> depends_lib-append port:atlas
</span><del>-
- if {[variant_isset universal]} {
- python.set_compiler no
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant openblas conflicts atlas description "Use MacPorts OpenBLAS Libraries" {
</span><span class="lines">@@ -150,7 +146,7 @@
</span><span class="cx"> ${worksrcpath}/numpy/distutils/fcompiler/gnu.py
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if {[variant_isset universal] && [variant_isset atlas]} {
</del><ins>+ if { [use_wrapper] } {
</ins><span class="cx"> # Prepare wrappers
</span><span class="cx"> file copy -force ${filespath}/wrapper-template \
</span><span class="cx"> ${worksrcpath}/c-wrapper
</span><span class="lines">@@ -171,16 +167,6 @@
</span><span class="cx"> reinplace "s|@@@|${configure.f90}|" ${worksrcpath}/f-wrapper
</span><span class="cx"> reinplace "s|---|\\\\.f|" ${worksrcpath}/f-wrapper
</span><span class="cx"> reinplace "s|&&&|${prefix}|" ${worksrcpath}/f-wrapper
</span><del>-
- build.env-append CC="${worksrcpath}/c-wrapper" \
- CXX="${worksrcpath}/cxx-wrapper" \
- F77="${worksrcpath}/f-wrapper" \
- F90="${worksrcpath}/f-wrapper"
-
- destroot.env-append CC="${worksrcpath}/c-wrapper" \
- CXX="${worksrcpath}/cxx-wrapper" \
- F77="${worksrcpath}/f-wrapper" \
- F90="${worksrcpath}/f-wrapper"
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {[variant_isset atlas]} {
</span><span class="lines">@@ -203,6 +189,39 @@
</span><span class="cx"> default_variants +gfortran
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ # determine if special wrapper values are needed for compiler names
+ # a procedure is needed since variants from PortGroup compilers must
+ # be evaluated before it can be determined if clang is being used
+ proc use_wrapper {} {
+ global configure.cc
+
+ if {[variant_isset universal]} {
+ if {[variant_isset atlas]} {
+ # uses fortran as a linker, which does not handle multile -arch values properly
+ return 1
+ }
+ if {![string match *clang* ${configure.cc}]} {
+ # gcc compilers do not handle multile -arch values properly
+ return 1
+ }
+ }
+ return 0
+ }
+
+ # set compiler names
+ proc set_compilers {} {
+ global configure.cc configure.cxx configure.fc worksrcpath
+
+ if {[use_wrapper]} {
+ # override values set in compilers PortGroup
+ configure.cc ${worksrcpath}/c-wrapper
+ configure.cxx ${worksrcpath}/cxx-wrapper
+ configure.fc ${worksrcpath}/f-wrapper
+ configure.f77 ${worksrcpath}/f-wrapper
+ configure.f90 ${worksrcpath}/f-wrapper
+ }
+ }
+
</ins><span class="cx"> livecheck.type none
</span><span class="cx"> } else {
</span><span class="cx"> livecheck.regex archive/[join ${github.tag_prefix} ""](\[\\d+(?:\\.\\d+)*"\]+)${extract.suffix}"
</span></span></pre>
</div>
</div>
</body>
</html>