<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/96734caea8b0b233b1b78437c0be8626775f1050">https://github.com/macports/macports-ports/commit/96734caea8b0b233b1b78437c0be8626775f1050</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 96734ca tcl: fix error on older compilers re: pragmas inside functions
</span>96734ca is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 96734caea8b0b233b1b78437c0be8626775f1050
</span>Author: kencu <ken.cunningham.webuse@gmail.com>
AuthorDate: Sun Aug 13 08:19:58 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> tcl: fix error on older compilers re: pragmas inside functions
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> move pragma just outside the function
</span><span style='display:block; white-space:pre;color:#404040;'> fixes build on older gcc compilers
</span><span style='display:block; white-space:pre;color:#404040;'> closes: https://trac.macports.org/ticket/54596
</span>---
lang/tcl/Portfile | 3 +++
lang/tcl/files/patch-unix-tclunixsock-pragma.diff | 31 +++++++++++++++++++++++
2 files changed, 34 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/tcl/Portfile b/lang/tcl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e402bf3..43201c8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/tcl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/tcl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,6 +30,9 @@ configure.args --mandir=${prefix}/share/man \
</span> configure.cppflags-delete -I${prefix}/include
configure.ldflags-delete -L${prefix}/lib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix error on older compilers with pragma inside functions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-unix-tclunixsock-pragma.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-configure {
reinplace -E {s|-arch [^ ]+||g} ${worksrcpath}/tclConfig.sh
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/tcl/files/patch-unix-tclunixsock-pragma.diff b/lang/tcl/files/patch-unix-tclunixsock-pragma.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7e535d6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/tcl/files/patch-unix-tclunixsock-pragma.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- tclUnixSock.c.orig 2017-08-13 07:57:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ tclUnixSock.c 2017-08-13 07:58:30.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -700,6 +700,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef NEED_FAKE_RFC2553
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#pragma GCC diagnostic push
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#pragma GCC diagnostic ignored "-Wstrict-aliasing"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline int
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IPv6AddressNeedsNumericRendering(
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct in6_addr addr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -713,16 +717,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * at least some versions of OSX.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#pragma GCC diagnostic push
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#pragma GCC diagnostic ignored "-Wstrict-aliasing"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!IN6_IS_ADDR_V4MAPPED(&addr)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#pragma GCC diagnostic pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (addr.s6_addr[12] == 0 && addr.s6_addr[13] == 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && addr.s6_addr[14] == 0 && addr.s6_addr[15] == 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#pragma GCC diagnostic pop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* NEED_FAKE_RFC2553 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span></pre><pre style='margin:0'>
</pre>