<!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>[115901] trunk/dports/lang/pure</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/115901">115901</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-01-13 17:12:49 -0800 (Mon, 13 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>pure: use llvm-3.4; I can no longer reproduce the pure-gen build failure that caused us to revert back to using llvm-3.2 in <a href="https://trac.macports.org/changeset/111396">r111396</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslangpurePortfile">trunk/dports/lang/pure/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslangpurefilespatchllvm34diff">trunk/dports/lang/pure/files/patch-llvm-3.4.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslangpurePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/pure/Portfile (115900 => 115901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/pure/Portfile 2014-01-14 00:45:21 UTC (rev 115900)
+++ trunk/dports/lang/pure/Portfile 2014-01-14 01:12:49 UTC (rev 115901)
</span><span class="lines">@@ -34,12 +34,12 @@
</span><span class="cx">
</span><span class="cx"> livecheck.type none
</span><span class="cx">
</span><del>-set llvm_version 3.2
</del><ins>+set llvm_version 3.4
</ins><span class="cx"> set llvm_prefix ${prefix}/libexec/llvm-${llvm_version}
</span><span class="cx"> configure.env PATH=${llvm_prefix}/bin:$env(PATH)
</span><span class="cx">
</span><span class="cx"> if {${name} eq ${subport}} {
</span><del>- revision 1
</del><ins>+ revision 2
</ins><span class="cx">
</span><span class="cx"> depends_lib port:gmp \
</span><span class="cx"> port:libiconv \
</span><span class="lines">@@ -50,16 +50,19 @@
</span><span class="cx">
</span><span class="cx"> depends_run port:w3m
</span><span class="cx">
</span><ins>+ patchfiles patch-llvm-3.4.diff
+
+ use_autoreconf yes
+
</ins><span class="cx"> configure.args --without-elisp \
</span><del>- --with-tool-prefix=${llvm_prefix}/bin/
</del><ins>+ --with-tool-prefix=${llvm_prefix}/bin
</ins><span class="cx">
</span><span class="cx"> # Prevent build failure when old llvm port is installed
</span><span class="cx"> configure.cppflags -I${llvm_prefix}/include ${configure.cppflags}
</span><span class="cx"> configure.ldflags -L${llvm_prefix}/lib ${configure.ldflags}
</span><span class="cx">
</span><span class="cx"> platform macosx {
</span><del>- depends_run-delete port:w3m
- depends_run-append port:openbrowser
</del><ins>+ depends_run-replace port:w3m port:openbrowser
</ins><span class="cx"> patchfiles-append patch-openbrowser.diff
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportslangpurefilespatchllvm34diff"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/pure/files/patch-llvm-3.4.diff (0 => 115901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/pure/files/patch-llvm-3.4.diff (rev 0)
+++ trunk/dports/lang/pure/files/patch-llvm-3.4.diff 2014-01-14 01:12:49 UTC (rev 115901)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+https://bitbucket.org/purelang/pure-lang/commits/00f09b2a47d3a7811f767ab30f679ebb984084d7
+--- configure.ac.orig
++++ configure.ac
+@@ -376,6 +376,19 @@
+ if test "$pure_cv_new_ostream" = yes; then
+ AC_DEFINE(NEW_OSTREAM, 1, [Define when building with new llvm::raw_fd_ostream interface (LLVM >= 2.7).])
+ fi
++AC_CACHE_CHECK([for new llvm::raw_fd_ostream interface (LLVM >= 3.4)], [pure_cv_new_ostream34],
++ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
++ #include <string>
++ #include <llvm/Support/raw_ostream.h>
++ ], [
++ std::string error;
++ llvm::raw_fd_ostream os("xxxjunk", error, llvm::sys::fs::F_Excl);
++ ])
++ ], [pure_cv_new_ostream34=yes], [pure_cv_new_ostream34=no])
++ ])
++if test "$pure_cv_new_ostream34" = yes; then
++ AC_DEFINE(NEW_OSTREAM34, 1, [Define when building with new llvm::raw_fd_ostream interface (LLVM >= 3.4).])
++fi
+ else
+ AC_CACHE_CHECK([for new LLVM IRBuilder class (LLVM >= 2.4)], [pure_cv_new_builder],
+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
+--- interpreter.cc.orig
++++ interpreter.cc
+@@ -10240,6 +10240,9 @@
+ #define ostream_clear_error(os) os.clear()
+ #endif
+
++#if NEW_OSTREAM34 // LLVM 3.4 cosmetic changes
++#define new_raw_fd_ostream(s,binary,msg) new llvm::raw_fd_ostream(s,msg,(binary)?llvm::sys::fs::F_Binary:llvm::sys::fs::F_None)
++#else
+ #if NEW_OSTREAM // LLVM >= 2.7 takes an enumeration as the last parameter
+ #define new_raw_fd_ostream(s,binary,msg) new llvm::raw_fd_ostream(s,msg,(binary)?llvm::raw_fd_ostream::F_Binary:0)
+ #else
+@@ -10249,6 +10252,7 @@
+ #define new_raw_fd_ostream(s,binary,msg) new llvm::raw_fd_ostream(s,binary,msg)
+ #endif
+ #endif
++#endif
+
+ void interpreter::check_used(set<Function*>& used,
+ map<GlobalVariable*,Function*>& varmap)
</ins></span></pre>
</div>
</div>
</body>
</html>