<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/978d6787fff82f71a0289188ead377d389bb8734">https://github.com/macports/macports-ports/commit/978d6787fff82f71a0289188ead377d389bb8734</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 978d678 http-parser: Use compiler, arch, universal
</span>978d678 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 978d6787fff82f71a0289188ead377d389bb8734
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Oct 4 12:40:38 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> http-parser: Use compiler, arch, universal
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Use the right compiler and -arch flags and add a universal variant.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes https://trac.macports.org/ticket/57247
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Only build the library in the build phase; don't run the tests.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Enable the test phase so that the tests can be run if desired.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fix the Makefile:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Don't use -Werror
</span><span style='display:block; white-space:pre;color:#404040;'> * Don't rebuild the library unless that's needed
</span><span style='display:block; white-space:pre;color:#404040;'> * Use -dynamiclib instead of -shared on macOS
</span>---
www/http-parser/Portfile | 21 +++++++++---
www/http-parser/files/patch-Makefile.diff | 53 +++++++++++++++++++++++++++++--
2 files changed, 67 insertions(+), 7 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/http-parser/Portfile b/www/http-parser/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d1a8c6f..21db97a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/http-parser/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/http-parser/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,8 +23,21 @@ patchfiles patch-Makefile.diff
</span>
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args CFLAGS="-DHTTP_PARSER_STRICT=0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+universal_variant yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cflags-append -DHTTP_PARSER_STRICT=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target library
</span> build.post_args-delete VERBOSE=ON
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.env-append PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix}
</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.env-append CFLAGS="${configure.cflags} [get_canonical_archflags cc]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
</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;'>+test.run yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+test.env {*}${build.env}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.env {*}${build.env}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/http-parser/files/patch-Makefile.diff b/www/http-parser/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5a4b4c1..320d3fc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/http-parser/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/http-parser/files/patch-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,47 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -131,14 +131,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not use -Werror because new compilers may include new warnings that the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+developer may not have anticipated.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Use -dynamiclib on macOS instead of -shared.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix the library target so that it only rebuilds the library if needed.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not use install's -D option which is a GNU extension not supported on macOS.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Mark the library target as phony.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2018-03-31 01:07:55.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2018-10-04 12:34:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -52,13 +52,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS_FAST += $(CPPFLAGS_FAST_EXTRA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPPFLAGS_BENCH = $(CPPFLAGS_FAST)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CFLAGS += -Wall -Wextra -Werror
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CFLAGS += -Wall -Wextra
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS_DEBUG = $(CFLAGS) -O0 -g $(CFLAGS_DEBUG_EXTRA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS_FAST = $(CFLAGS) -O3 $(CFLAGS_FAST_EXTRA)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS_BENCH = $(CFLAGS_FAST) -Wno-unused-parameter
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS_LIB = $(CFLAGS_FAST) -fPIC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ifeq (darwin,$(PLATFORM))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LDFLAGS_LIB = $(LDFLAGS) -dynamiclib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS_LIB = $(LDFLAGS) -shared
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL ?= install
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX ?= /usr/local
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -109,8 +113,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libhttp_parser.o: http_parser.c http_parser.h Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CC) $(CPPFLAGS_FAST) $(CFLAGS_LIB) -c http_parser.c -o libhttp_parser.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-library: libhttp_parser.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CC) $(LDFLAGS_LIB) -o $(LIBNAME) $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++library: $(LIBNAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++$(LIBNAME): libhttp_parser.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) $(LDFLAGS_LIB) -o $@ $<
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ package: http_parser.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(AR) rcs libhttp_parser.a http_parser.o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -131,14 +136,14 @@
</span> ctags $^
install: library
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,3 +60,9 @@
</span> ln -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
ln -s $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SOLIBNAME).$(SOEXT)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -157,4 +162,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ contrib/url_parser.c: http_parser.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ contrib/parsertrace.c: http_parser.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-.PHONY: clean package test-run test-run-timed test-valgrind install install-strip uninstall
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++.PHONY: clean library package test-run test-run-timed test-valgrind install install-strip uninstall
</span></pre><pre style='margin:0'>
</pre>