<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/a1c1e398920683b3259c5a7c691a5b1f179d6e44">https://github.com/macports/macports-ports/commit/a1c1e398920683b3259c5a7c691a5b1f179d6e44</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 a1c1e39 irssistats: Fix build failure
</span>a1c1e39 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a1c1e398920683b3259c5a7c691a5b1f179d6e44
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sun Oct 7 19:38:12 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> irssistats: Fix build failure
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix build failure with clang by not using nested functions.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also use the right compiler and -arch flags and optimization flags.
</span>---
irc/irssistats/Portfile | 17 +++++++++++++----
irc/irssistats/files/Makefile.patch | 14 ++++++++++++++
irc/irssistats/files/nested-functions.patch | 20 ++++++++++++++++++++
3 files changed, 47 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/irssistats/Portfile b/irc/irssistats/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 37d614e..c1406c5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/irc/irssistats/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/irssistats/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,7 +2,7 @@ PortSystem 1.0
</span>
name irssistats
version 0.75
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories irc
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,8 +15,11 @@ master_sites ${homepage}
</span> checksums rmd160 14a7a172a88d285b59d8a7c050b2aa545c902076 \
sha256 7aabbdb55158299997f82a39f1b403339a4ad74b4679030f317a27042d87eb90
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -locale en_US.ISO8859-1 "s|/etc|${prefix}/etc|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles Makefile.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nested-functions.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace -locale C "s|/etc|${prefix}/etc|" \
</span> ${worksrcpath}/irssistats.1 \
${worksrcpath}/irssistats.c \
${worksrcpath}/irssistats.sgml \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,9 +30,15 @@ patch {
</span> }
use_configure no
<span style='display:block; white-space:pre;background:#e0ffe0;'>+universal_variant yes
</span>
build.target
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CFLAGS="-O2 -fnested-functions"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args CC="${configure.cc}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="${configure.cflags} [get_canonical_archflags cc]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.destdir PRE=${destroot}${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/irssistats/files/Makefile.patch b/irc/irssistats/files/Makefile.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..62af5c8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/irssistats/files/Makefile.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2007-09-20 15:30:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2018-10-07 19:24:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4,9 +4,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DOC = $(PRE)/share/doc/irssistats
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MAN = $(PRE)/share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS ?= -O2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CC ?= gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ irssistats:irssistats.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gcc $(CFLAGS) -o irssistats irssistats.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $(CFLAGS) -o irssistats irssistats.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ clean:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f irssistats
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/irc/irssistats/files/nested-functions.patch b/irc/irssistats/files/nested-functions.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b9312b3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/irc/irssistats/files/nested-functions.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- irssistats.c.orig 2007-11-10 12:40:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ irssistats.c 2018-10-07 19:34:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1561,8 +1561,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fclose(fic);
</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;'>+-void parse_config(char *configfile)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void expand(char *path)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char temp[MAXLINELENGTH];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1574,6 +1572,8 @@
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void parse_config(char *configfile)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE *fic;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char line[MAXLINELENGTH];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char keyword[MAXLINELENGTH];
</span></pre><pre style='margin:0'>
</pre>