<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/93a5df74ff04258a372ec828e27e2dae6306e4da">https://github.com/macports/macports-ports/commit/93a5df74ff04258a372ec828e27e2dae6306e4da</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 93a5df74ff04258a372ec828e27e2dae6306e4da
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Mar 9 13:42:48 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> gcc48: use isl 1.4 instead of latest isl
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://trac.macports.org/ticket/53662
</span>---
lang/gcc48/Portfile | 11 ++++++++--
lang/gcc48/files/patch-libisl.diff | 44 ++++++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc48/Portfile b/lang/gcc48/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 02a7e90..a51d187 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/gcc48/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc48/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ checksums rmd160 98e84aa59bd668c4ab58afea9c7a2d1cc0c6ef7e \
</span> depends_lib port:cctools \
path:lib/pkgconfig/cloog-isl.pc:cloog \
port:gmp \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/isl.pc:isl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:isl14 \
</span> port:ld64 \
path:lib/libgcc/libgcc_s.1.dylib:libgcc \
port:libiconv \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,6 +54,13 @@ patchfiles-append macosx-version-min.patch
</span> # later (#45483).
patchfiles-append yosemite-libtool.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# See https://trac.macports.org/ticket/53662
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-libisl.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-extract {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${build.dir}/gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/libexec/isl14/include/isl ${build.dir}/gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> set major [join [lrange [split ${version} .-] 0 1] .]
platform darwin {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +83,7 @@ configure.args --enable-languages=c,c++,objc,obj-c++,lto,fortran,java \
</span> --with-gmp=${prefix} \
--with-mpfr=${prefix} \
--with-mpc=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-isl=${prefix} --disable-isl-version-check \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-isl=${prefix}/libexec/isl14 --disable-isl-version-check \
</span> --with-cloog=${prefix} --disable-cloog-version-check \
--enable-stage1-checking \
--disable-multilib \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/gcc48/files/patch-libisl.diff b/lang/gcc48/files/patch-libisl.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..763bd66
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/gcc48/files/patch-libisl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2015-05-03 10:26:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2017-03-05 10:09:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5855,7 +5855,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBS="${_isl_saved_LIBS} -lisl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBS="${_isl_saved_LIBS} -lisl.13"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.10 of ISL" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking for version 0.10 of ISL... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5903,7 +5903,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBS="${_isl_saved_LIBS} -lisl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBS="${_isl_saved_LIBS} -lisl.13"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.11 of ISL" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking for version 0.11 of ISL... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5951,7 +5951,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBS="${_isl_saved_LIBS} -lisl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBS="${_isl_saved_LIBS} -lisl.13"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.12 of ISL" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking for version 0.12 of ISL... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5999,7 +5999,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="${_isl_saved_CFLAGS} ${islinc} ${gmpinc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS="${_isl_saved_LDFLAGS} ${isllibs}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIBS="${_isl_saved_LIBS} -lisl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIBS="${_isl_saved_LIBS} -lisl.13"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.14 of ISL" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking for version 0.14 of ISL... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6124,7 +6124,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clooginc="-DCLOOG_INT_GMP ${clooginc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- clooglibs="${clooglibs} -lcloog-isl ${isllibs} -lisl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ clooglibs="${clooglibs} -lcloog-isl ${isllibs} -lisl.13"
</span></pre><pre style='margin:0'>
</pre>