<!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>[120764] trunk/dports/science/root6/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/120764">120764</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-06-06 07:30:14 -0700 (Fri, 06 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>root6: fix configure.cxx_stdlib and compiler blacklist (#43917)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceroot6Portfile">trunk/dports/science/root6/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceroot6Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/root6/Portfile (120763 => 120764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/root6/Portfile 2014-06-06 13:26:55 UTC (rev 120763)
+++ trunk/dports/science/root6/Portfile 2014-06-06 14:30:14 UTC (rev 120764)
</span><span class="lines">@@ -9,8 +9,6 @@
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx"> PortGroup select 1.0
</span><span class="cx">
</span><del>-# TODO: try to figure out if one could also build root6 on < 10.9
-
</del><span class="cx"> # Essentially 6.00.00, but with some bug fixes to the build system
</span><span class="cx"> github.setup root-mirror root aaf9b65
</span><span class="cx"> #github.setup root-mirror root 6-00-00 v
</span><span class="lines">@@ -37,27 +35,6 @@
</span><span class="cx"> configure.dir ${workpath}/build
</span><span class="cx"> build.dir ${configure.dir}
</span><span class="cx">
</span><del>-# (copied from llvm-3.5)
-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
-platform darwin {
- # Note that we are forcing this choice. This means that anything linking
- # against llvm-3.5 needs to also be using libc++. This is possibly
- # problematic, but luckily there is just a limited set of such dependents.
-
- if {[info exists configure.cxx_stdlib]} {
- configure.cxx_stdlib libc++
- }
-
- depends_lib-append port:libcxx
-}
-pre-fetch {
- if {(${os.major} < 13 && ! [info exists configure.cxx_stdlib]) ||
- (! [file exists /usr/lib/libc++.dylib])} {
- ui_error "$name requires a C++11 runtime, which your configuration does not allow"
- error "unsupported configuration"
- }
-}
-
</del><span class="cx"> post-extract {
</span><span class="cx"> file mkdir ${configure.dir}
</span><span class="cx"> }
</span><span class="lines">@@ -80,10 +57,10 @@
</span><span class="cx"> select.group root
</span><span class="cx"> select.file ${filespath}/${name}
</span><span class="cx">
</span><del>-# TODO: exact compiler fallback/black list
</del><span class="cx"> # Force a compatible compiler
</span><del>-compiler.blacklist-append {clang < 425} macports-clang-2.9
-compiler.fallback-append macports-clang-3.5 macports-clang-3.4 macports-clang-3.3
</del><ins>+# (macports-clang-3.3 works; it's blacklisted only to give the preference to 3.4)
+compiler.blacklist-append *gcc* {clang < 500} macports-clang-2.9 macports-clang-3.0 macports-clang-3.1 macports-clang-3.2 macports-clang-3.3
+compiler.fallback-append macports-clang-3.4 macports-clang-3.5
</ins><span class="cx">
</span><span class="cx"> # port specific location
</span><span class="cx"> set install_prefix ${prefix}/libexec/root${version_major}
</span><span class="lines">@@ -125,15 +102,14 @@
</span><span class="cx"> -Dbonjour=OFF \
</span><span class="cx"> -Dgviz=OFF \
</span><span class="cx"> -Dsoversion=OFF \
</span><del>- -Dc++11=OFF \
- -Dlibcxx=OFF \
</del><ins>+ -Dc++11=ON \
+ -Dlibcxx=ON \
</ins><span class="cx"> -Dxrootd=OFF \
</span><span class="cx"> -Dbuiltin_ftgl=ON \
</span><span class="cx"> -Dmathmore=ON \
</span><span class="cx"> -Dgenvector=ON \
</span><span class="cx"> -Dmemstat=ON \
</span><span class="cx"> -Dunuran=ON \
</span><del>- -Dreflex=ON \
</del><span class="cx"> -Dtable=ON \
</span><span class="cx"> -Dgdml=ON \
</span><span class="cx"> -DPNG_LIBRARY=${prefix}/lib/libpng.dylib \
</span><span class="lines">@@ -145,23 +121,16 @@
</span><span class="cx"> configure.args-append -DCMAKE_INCLUDE_PATH=${prefix}/include
</span><span class="cx"> configure.cppflags-delete -I${prefix}/include
</span><span class="cx">
</span><del>-# TODO: Check ${configure.cxx_stdlib} directly once MacPorts 2.3 is released
</del><span class="cx"> platform darwin {
</span><del>- set cxxstdlib {}
-
- if {[info exists configure.cxx_stdlib] &&
- ${configure.cxx_stdlib} ne {} &&
- [string match *clang* ${configure.cxx}]} {
- set cxxstdlib ${configure.cxx_stdlib}
- } elseif {[string match *clang* ${configure.cxx}] && ${os.major} >= 13} {
- set cxxstdlib libc++
- } else {
- set cxxstdlib libstdc++
</del><ins>+ # Note that we are forcing this choice. This means that anything linking
+ # against root6 needs to also be using libc++. This is possibly
+ # problematic, but luckily there is just a limited set of such dependents.
+ # Another problem is that all dependencies might need to be built-in
+ # to make sure that they all use libc++.
+ if { ${configure.cxx_stdlib} ne "libc++" } {
+ configure.cxx_stdlib libc++
+ depends_lib-append port:libcxx
</ins><span class="cx"> }
</span><del>-
- if {${cxxstdlib} eq "libc++"} {
- configure.args-replace -Dc++11=OFF -Dc++11=ON
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-destroot {
</span></span></pre>
</div>
</div>
</body>
</html>