<!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>[128720] trunk/dports/lang</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/128720">128720</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2014-11-27 00:51:15 -0800 (Thu, 27 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gcc48, gcc49: Build with MacPorts' isl (#45984)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportslanggcc48Portfile">trunk/dports/lang/gcc48/Portfile</a></li>
<li><a href="#trunkdportslanggcc49Portfile">trunk/dports/lang/gcc49/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportslanggcc48filesisl014compatibilitypatch">trunk/dports/lang/gcc48/files/isl-0.14-compatibility.patch</a></li>
<li><a href="#trunkdportslanggcc49filesisl014compatibilitypatch">trunk/dports/lang/gcc49/files/isl-0.14-compatibility.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportslanggcc48Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/gcc48/Portfile (128719 => 128720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/gcc48/Portfile 2014-11-27 08:51:08 UTC (rev 128719)
+++ trunk/dports/lang/gcc48/Portfile 2014-11-27 08:51:15 UTC (rev 128720)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> # Whenever this port is bumped for version/revision, please revbump dragonegg-*-gcc-4.8
</span><span class="cx"> epoch 2
</span><span class="cx"> version 4.8.3
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx"> platforms darwin
</span><span class="cx"> categories lang
</span><span class="cx"> maintainers mww openmaintainer
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> depends_lib port:cctools \
</span><span class="cx"> path:lib/pkgconfig/cloog-isl.pc:cloog \
</span><span class="cx"> port:gmp \
</span><ins>+ path:lib/pkgconfig/isl.pc:isl \
</ins><span class="cx"> port:ld64 \
</span><span class="cx"> path:lib/libgcc/libgcc_s.1.dylib:libgcc \
</span><span class="cx"> port:libiconv \
</span><span class="lines">@@ -46,9 +47,12 @@
</span><span class="cx"> depends_skip_archcheck-append gcc_select ld64 cctools
</span><span class="cx"> license_noconflict gmp mpfr ppl libmpc
</span><span class="cx">
</span><ins>+# Enable building with MacPorts' isl (#45984).
+patchfiles-append isl-0.14-compatibility.patch
+
</ins><span class="cx"> # Handle OS X deployment targets correctly (GCC PR target/63810
</span><span class="cx"> # <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63810>).
</span><del>-patchfiles macosx-version-min.patch
</del><ins>+patchfiles-append macosx-version-min.patch
</ins><span class="cx">
</span><span class="cx"> # Don't link with "-flat_namespace -undefined suppress" on Yosemite and
</span><span class="cx"> # later (#45483).
</span><span class="lines">@@ -76,8 +80,8 @@
</span><span class="cx"> --with-gmp=${prefix} \
</span><span class="cx"> --with-mpfr=${prefix} \
</span><span class="cx"> --with-mpc=${prefix} \
</span><del>- --with-cloog=${prefix} --enable-cloog-backend=isl \
- --disable-cloog-version-check \
</del><ins>+ --with-isl=${prefix} --disable-isl-version-check \
+ --with-cloog=${prefix} --disable-cloog-version-check \
</ins><span class="cx"> --enable-stage1-checking \
</span><span class="cx"> --disable-multilib \
</span><span class="cx"> --enable-lto \
</span></span></pre></div>
<a id="trunkdportslanggcc48filesisl014compatibilitypatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/gcc48/files/isl-0.14-compatibility.patch (0 => 128720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/gcc48/files/isl-0.14-compatibility.patch (rev 0)
+++ trunk/dports/lang/gcc48/files/isl-0.14-compatibility.patch 2014-11-27 08:51:15 UTC (rev 128720)
</span><span class="lines">@@ -0,0 +1,80 @@
</span><ins>+Index: gcc/graphite-clast-to-gimple.c
+===================================================================
+--- gcc/graphite-clast-to-gimple.c.orig
++++ gcc/graphite-clast-to-gimple.c
+@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3.
+ #include <isl/union_map.h>
+ #include <isl/list.h>
+ #include <isl/constraint.h>
+-#include <isl/ilp.h>
++#include <isl/deprecated/ilp_int.h>
+ #include <isl/aff.h>
+ #include <cloog/cloog.h>
+ #include <cloog/isl/domain.h>
+Index: gcc/graphite-interchange.c
+===================================================================
+--- gcc/graphite-interchange.c.orig
++++ gcc/graphite-interchange.c
+@@ -24,11 +24,12 @@ along with GCC; see the file COPYING3.
+ #include "config.h"
+
+ #ifdef HAVE_cloog
++#include <isl/deprecated/constraint_int.h>
+ #include <isl/aff.h>
+ #include <isl/set.h>
+ #include <isl/map.h>
+ #include <isl/union_map.h>
+-#include <isl/ilp.h>
++#include <isl/deprecated/ilp_int.h>
+ #include <cloog/cloog.h>
+ #include <cloog/isl/domain.h>
+ #endif
+Index: gcc/graphite-optimize-isl.c
+===================================================================
+--- gcc/graphite-optimize-isl.c.orig
++++ gcc/graphite-optimize-isl.c
+@@ -27,6 +27,7 @@ along with GCC; see the file COPYING3.
+ #include <isl/schedule.h>
+ #include <isl/band.h>
+ #include <isl/aff.h>
++#include <isl/deprecated/aff_int.h>
+ #include <isl/options.h>
+ #endif
+
+@@ -365,7 +366,7 @@ getScheduleForBandList(isl_band_list *Ba
+ {
+ for (i = ScheduleDimensions - 1 ; i >= 0 ; i--)
+ {
+- if (isl_band_member_is_zero_distance(Band, i))
++ if (isl_band_member_is_coincident(Band, i))
+ {
+ isl_map *TileMap;
+ isl_union_map *TileUMap;
+Index: gcc/graphite-poly.c
+===================================================================
+--- gcc/graphite-poly.c.orig
++++ gcc/graphite-poly.c
+@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3.
+ #include <isl/map.h>
+ #include <isl/union_map.h>
+ #include <isl/constraint.h>
+-#include <isl/ilp.h>
++#include <isl/deprecated/ilp_int.h>
+ #include <isl/aff.h>
+ #include <cloog/cloog.h>
+ #include <cloog/isl/domain.h>
+Index: gcc/graphite-sese-to-poly.c
+===================================================================
+--- gcc/graphite-sese-to-poly.c.orig
++++ gcc/graphite-sese-to-poly.c
+@@ -24,8 +24,9 @@ along with GCC; see the file COPYING3.
+ #include <isl/set.h>
+ #include <isl/map.h>
+ #include <isl/union_map.h>
+-#include <isl/constraint.h>
++#include <isl/deprecated/constraint_int.h>
+ #include <isl/aff.h>
++#include <isl/deprecated/aff_int.h>
+ #include <cloog/cloog.h>
+ #include <cloog/cloog.h>
+ #include <cloog/isl/domain.h>
</ins></span></pre></div>
<a id="trunkdportslanggcc49Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/gcc49/Portfile (128719 => 128720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/gcc49/Portfile 2014-11-27 08:51:08 UTC (rev 128719)
+++ trunk/dports/lang/gcc49/Portfile 2014-11-27 08:51:15 UTC (rev 128720)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx">
</span><span class="cx"> epoch 2
</span><span class="cx"> version 4.9.2
</span><ins>+revision 1
</ins><span class="cx"> platforms darwin
</span><span class="cx"> categories lang
</span><span class="cx"> maintainers mww openmaintainer
</span><span class="lines">@@ -35,6 +36,7 @@
</span><span class="cx"> depends_lib port:cctools \
</span><span class="cx"> path:lib/pkgconfig/cloog-isl.pc:cloog \
</span><span class="cx"> port:gmp \
</span><ins>+ path:lib/pkgconfig/isl.pc:isl \
</ins><span class="cx"> port:ld64 \
</span><span class="cx"> path:lib/libgcc/libgcc_s.1.dylib:libgcc \
</span><span class="cx"> port:libiconv \
</span><span class="lines">@@ -45,9 +47,12 @@
</span><span class="cx"> depends_skip_archcheck-append gcc_select ld64 cctools
</span><span class="cx"> license_noconflict gmp mpfr ppl libmpc
</span><span class="cx">
</span><ins>+# Enable building with MacPorts' isl (#45984).
+patchfiles-append isl-0.14-compatibility.patch
+
</ins><span class="cx"> # Handle OS X deployment targets correctly (GCC PR target/63810
</span><span class="cx"> # <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63810>).
</span><del>-patchfiles macosx-version-min.patch
</del><ins>+patchfiles-append macosx-version-min.patch
</ins><span class="cx">
</span><span class="cx"> # Fix bootstrap regression on PowerPC (GCC PR bootstrap/63703
</span><span class="cx"> # <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63703>).
</span><span class="lines">@@ -79,8 +84,8 @@
</span><span class="cx"> --with-gmp=${prefix} \
</span><span class="cx"> --with-mpfr=${prefix} \
</span><span class="cx"> --with-mpc=${prefix} \
</span><del>- --with-cloog=${prefix} --enable-cloog-backend=isl \
- --disable-cloog-version-check \
</del><ins>+ --with-isl=${prefix} --disable-isl-version-check \
+ --with-cloog=${prefix} --disable-cloog-version-check \
</ins><span class="cx"> --enable-stage1-checking \
</span><span class="cx"> --disable-multilib \
</span><span class="cx"> --enable-lto \
</span></span></pre></div>
<a id="trunkdportslanggcc49filesisl014compatibilitypatch"></a>
<div class="addfile"><h4>Added: trunk/dports/lang/gcc49/files/isl-0.14-compatibility.patch (0 => 128720)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/gcc49/files/isl-0.14-compatibility.patch (rev 0)
+++ trunk/dports/lang/gcc49/files/isl-0.14-compatibility.patch 2014-11-27 08:51:15 UTC (rev 128720)
</span><span class="lines">@@ -0,0 +1,80 @@
</span><ins>+Index: gcc/graphite-clast-to-gimple.c
+===================================================================
+--- gcc/graphite-clast-to-gimple.c.orig
++++ gcc/graphite-clast-to-gimple.c
+@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3.
+ #include <isl/union_map.h>
+ #include <isl/list.h>
+ #include <isl/constraint.h>
+-#include <isl/ilp.h>
++#include <isl/deprecated/ilp_int.h>
+ #include <isl/aff.h>
+ #include <cloog/cloog.h>
+ #include <cloog/isl/domain.h>
+Index: gcc/graphite-interchange.c
+===================================================================
+--- gcc/graphite-interchange.c.orig
++++ gcc/graphite-interchange.c
+@@ -24,11 +24,12 @@ along with GCC; see the file COPYING3.
+ #include "config.h"
+
+ #ifdef HAVE_cloog
++#include <isl/deprecated/constraint_int.h>
+ #include <isl/aff.h>
+ #include <isl/set.h>
+ #include <isl/map.h>
+ #include <isl/union_map.h>
+-#include <isl/ilp.h>
++#include <isl/deprecated/ilp_int.h>
+ #include <cloog/cloog.h>
+ #include <cloog/isl/domain.h>
+ #endif
+Index: gcc/graphite-optimize-isl.c
+===================================================================
+--- gcc/graphite-optimize-isl.c.orig
++++ gcc/graphite-optimize-isl.c
+@@ -27,6 +27,7 @@ along with GCC; see the file COPYING3.
+ #include <isl/schedule.h>
+ #include <isl/band.h>
+ #include <isl/aff.h>
++#include <isl/deprecated/aff_int.h>
+ #include <isl/options.h>
+ #endif
+
+@@ -373,7 +374,7 @@ getScheduleForBandList (isl_band_list *B
+ {
+ for (i = ScheduleDimensions - 1 ; i >= 0 ; i--)
+ {
+- if (isl_band_member_is_zero_distance (Band, i))
++ if (isl_band_member_is_coincident (Band, i))
+ {
+ isl_map *TileMap;
+ isl_union_map *TileUMap;
+Index: gcc/graphite-poly.c
+===================================================================
+--- gcc/graphite-poly.c.orig
++++ gcc/graphite-poly.c
+@@ -26,7 +26,7 @@ along with GCC; see the file COPYING3.
+ #include <isl/map.h>
+ #include <isl/union_map.h>
+ #include <isl/constraint.h>
+-#include <isl/ilp.h>
++#include <isl/deprecated/ilp_int.h>
+ #include <isl/aff.h>
+ #include <cloog/cloog.h>
+ #include <cloog/isl/domain.h>
+Index: gcc/graphite-sese-to-poly.c
+===================================================================
+--- gcc/graphite-sese-to-poly.c.orig
++++ gcc/graphite-sese-to-poly.c
+@@ -24,8 +24,9 @@ along with GCC; see the file COPYING3.
+ #include <isl/set.h>
+ #include <isl/map.h>
+ #include <isl/union_map.h>
+-#include <isl/constraint.h>
++#include <isl/deprecated/constraint_int.h>
+ #include <isl/aff.h>
++#include <isl/deprecated/aff_int.h>
+ #include <cloog/cloog.h>
+ #include <cloog/cloog.h>
+ #include <cloog/isl/domain.h>
</ins></span></pre>
</div>
</div>
</body>
</html>