[128720] trunk/dports/lang
larryv at macports.org
larryv at macports.org
Thu Nov 27 00:51:16 PST 2014
Revision: 128720
https://trac.macports.org/changeset/128720
Author: larryv at macports.org
Date: 2014-11-27 00:51:15 -0800 (Thu, 27 Nov 2014)
Log Message:
-----------
gcc48, gcc49: Build with MacPorts' isl (#45984)
Modified Paths:
--------------
trunk/dports/lang/gcc48/Portfile
trunk/dports/lang/gcc49/Portfile
Added Paths:
-----------
trunk/dports/lang/gcc48/files/isl-0.14-compatibility.patch
trunk/dports/lang/gcc49/files/isl-0.14-compatibility.patch
Modified: trunk/dports/lang/gcc48/Portfile
===================================================================
--- 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)
@@ -10,7 +10,7 @@
# Whenever this port is bumped for version/revision, please revbump dragonegg-*-gcc-4.8
epoch 2
version 4.8.3
-revision 2
+revision 3
platforms darwin
categories lang
maintainers mww openmaintainer
@@ -36,6 +36,7 @@
depends_lib port:cctools \
path:lib/pkgconfig/cloog-isl.pc:cloog \
port:gmp \
+ path:lib/pkgconfig/isl.pc:isl \
port:ld64 \
path:lib/libgcc/libgcc_s.1.dylib:libgcc \
port:libiconv \
@@ -46,9 +47,12 @@
depends_skip_archcheck-append gcc_select ld64 cctools
license_noconflict gmp mpfr ppl libmpc
+# Enable building with MacPorts' isl (#45984).
+patchfiles-append isl-0.14-compatibility.patch
+
# Handle OS X deployment targets correctly (GCC PR target/63810
# <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63810>).
-patchfiles macosx-version-min.patch
+patchfiles-append macosx-version-min.patch
# Don't link with "-flat_namespace -undefined suppress" on Yosemite and
# later (#45483).
@@ -76,8 +80,8 @@
--with-gmp=${prefix} \
--with-mpfr=${prefix} \
--with-mpc=${prefix} \
- --with-cloog=${prefix} --enable-cloog-backend=isl \
- --disable-cloog-version-check \
+ --with-isl=${prefix} --disable-isl-version-check \
+ --with-cloog=${prefix} --disable-cloog-version-check \
--enable-stage1-checking \
--disable-multilib \
--enable-lto \
Added: trunk/dports/lang/gcc48/files/isl-0.14-compatibility.patch
===================================================================
--- 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)
@@ -0,0 +1,80 @@
+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>
Modified: trunk/dports/lang/gcc49/Portfile
===================================================================
--- 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)
@@ -10,6 +10,7 @@
epoch 2
version 4.9.2
+revision 1
platforms darwin
categories lang
maintainers mww openmaintainer
@@ -35,6 +36,7 @@
depends_lib port:cctools \
path:lib/pkgconfig/cloog-isl.pc:cloog \
port:gmp \
+ path:lib/pkgconfig/isl.pc:isl \
port:ld64 \
path:lib/libgcc/libgcc_s.1.dylib:libgcc \
port:libiconv \
@@ -45,9 +47,12 @@
depends_skip_archcheck-append gcc_select ld64 cctools
license_noconflict gmp mpfr ppl libmpc
+# Enable building with MacPorts' isl (#45984).
+patchfiles-append isl-0.14-compatibility.patch
+
# Handle OS X deployment targets correctly (GCC PR target/63810
# <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63810>).
-patchfiles macosx-version-min.patch
+patchfiles-append macosx-version-min.patch
# Fix bootstrap regression on PowerPC (GCC PR bootstrap/63703
# <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63703>).
@@ -79,8 +84,8 @@
--with-gmp=${prefix} \
--with-mpfr=${prefix} \
--with-mpc=${prefix} \
- --with-cloog=${prefix} --enable-cloog-backend=isl \
- --disable-cloog-version-check \
+ --with-isl=${prefix} --disable-isl-version-check \
+ --with-cloog=${prefix} --disable-cloog-version-check \
--enable-stage1-checking \
--disable-multilib \
--enable-lto \
Added: trunk/dports/lang/gcc49/files/isl-0.14-compatibility.patch
===================================================================
--- 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)
@@ -0,0 +1,80 @@
+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>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141127/a904f21f/attachment-0001.html>
More information about the macports-changes
mailing list