<!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>[132224] trunk/dports/math/octave</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/132224">132224</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-01-26 13:44:13 -0800 (Mon, 26 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>octave: when neither +accelerate nor +atlas is selected, default to the correct one for the selected Fortran compiler.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathoctavePortfile">trunk/dports/math/octave/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsmathoctavefilespatchclanglibcxxdiff">trunk/dports/math/octave/files/patch-clang-libcxx.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmathoctavePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/octave/Portfile (132223 => 132224)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave/Portfile 2015-01-26 21:32:09 UTC (rev 132223)
+++ trunk/dports/math/octave/Portfile 2015-01-26 21:44:13 UTC (rev 132224)
</span><span class="lines">@@ -143,7 +143,15 @@
</span><span class="cx"> conflicts atlas {}
</span><span class="cx">
</span><span class="cx"> if {![variant_isset accelerate] && ![variant_isset atlas]} {
</span><del>- default_variants +atlas
</del><ins>+
+ # when neither +accelerate nor +atlas is selected, default to the
+ # correct one for the selected Fortran compiler.
+ if {![variant_isset g95]} {
+ default_variants +atlas
+ } else {
+ default_variants +accelerate
+ }
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # make sure that either +accelerate or +atlas is selected
</span></span></pre></div>
<a id="trunkdportsmathoctavefilespatchclanglibcxxdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/math/octave/files/patch-clang-libcxx.diff (0 => 132224)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave/files/patch-clang-libcxx.diff (rev 0)
+++ trunk/dports/math/octave/files/patch-clang-libcxx.diff 2015-01-26 21:44:13 UTC (rev 132224)
</span><span class="lines">@@ -0,0 +1,105 @@
</span><ins>+# HG changeset patch
+# User Kefu Chai <tchaikov@gmail.com>
+# Date 1413043255 -28800
+# Sun Oct 12 00:00:55 2014 +0800
+# Node ID 1433cd4f7b7bda0b0e0a04f990b55ffc3cbaf701
+# Parent 91a6f06c505220d269de3a0dab8cc898d03d91a0
+fix the build error on clang 3.5 and libc++ (bug #43298)
+
+* liboctave/operators/mx-inlines.cc:
+use the workaround if libc++ with this issue is detected.
+
+* liboctave/operators/libcxx-fix.cc:
+add a workaround for http://llvm.org/bugs/show_bug.cgi?id=21083, so that only
+the arithmetic types are accepted for the function template "libcxx_fix::pow()".
+
+diff -r 91a6f06c5052 -r 1433cd4f7b7b liboctave/operators/libcxx-fix.h
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ liboctave/operators/libcxx-fix.h Sun Oct 12 00:00:55 2014 +0800
+@@ -0,0 +1,69 @@
++#ifndef _LIBCPP_VERSION
++#error "for libc++ only"
++#endif
++
++namespace libcxx_fix {
++
++using std::is_integral;
++using std::is_same;
++using std::enable_if;
++
++template <class _Tp, class _Tn = void>
++struct numeric_type
++{
++ typedef void type;
++ static const bool value = false;
++};
++
++template <class _Tp>
++struct numeric_type<_Tp, typename enable_if<is_integral<_Tp>::value ||
++ is_same<_Tp, double>::value>::type>
++{
++ typedef double type;
++ static const bool value = true;
++};
++
++template <class _Tp>
++struct numeric_type<_Tp, typename enable_if<is_same<_Tp, long double>::value ||
++ is_same<_Tp, float>::value>::type>
++{
++ typedef _Tp type;
++ static const bool value = true;
++};
++
++template <>
++struct numeric_type<void, void>
++{
++ static const bool value = true;
++};
++
++template <class _A1, class _A2,
++ bool = numeric_type<_A1>::value &&
++ numeric_type<_A2>::value>
++class promote
++{};
++
++template <class _A1, class _A2>
++class promote<_A1, _A2, true>
++{
++private:
++ typedef typename numeric_type<_A1>::type __type1;
++ typedef typename numeric_type<_A2>::type __type2;
++public:
++ typedef decltype(__type1() + __type2()) type;
++};
++
++template <class _A1, class _A2>
++inline _LIBCPP_INLINE_VISIBILITY
++typename promote<_A1, _A2>::type
++pow(_A1 __x, _A2 __y) _NOEXCEPT
++{
++ typedef typename promote<_A1, _A2>::type __result_type;
++#if _LIBCPP_STD_VER > 11
++ static_assert((!(is_same<_A1, __result_type>::value &&
++ is_same<_A2, __result_type>::value)), "");
++#endif
++ return ::pow(static_cast<__result_type>(__x), static_cast<__result_type>(__y));
++}
++
++}
+diff -r 91a6f06c5052 -r 1433cd4f7b7b liboctave/operators/mx-inlines.cc
+--- liboctave/operators/mx-inlines.cc Thu Oct 09 20:38:04 2014 -0700
++++ liboctave/operators/mx-inlines.cc Sun Oct 12 00:00:55 2014 +0800
+@@ -306,7 +306,13 @@
+
+ // Let the compiler decide which pow to use, whichever best matches the
+ // arguments provided.
++#if defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION >= 1101)
++// Workaround http://llvm.org/bugs/show_bug.cgi?id=21083
++#include "libcxx-fix.h"
++using libcxx_fix::pow;
++#else
+ using std::pow;
++#endif
+ DEFMXMAPPER2X (mx_inline_pow, pow)
+
+ // Arbitrary function appliers. The function is a template parameter to enable
</ins></span></pre>
</div>
</div>
</body>
</html>