svn commit: r550699 - in head/www/nginx-devel: . files
Sergey A. Osokin
osa at FreeBSD.org
Wed Sep 30 13:11:27 UTC 2020
Author: osa
Date: Wed Sep 30 13:11:26 2020
New Revision: 550699
URL: https://svnweb.freebsd.org/changeset/ports/550699
Log:
Merge r549093 to fix build with -fno-common.
Bump PORTREVISION.
Spotted by: vanilla
Added:
head/www/nginx-devel/files/extra-patch-nchan-store-private.h (contents, props changed)
Modified:
head/www/nginx-devel/Makefile
head/www/nginx-devel/Makefile.extmod
Modified: head/www/nginx-devel/Makefile
==============================================================================
--- head/www/nginx-devel/Makefile Wed Sep 30 12:52:41 2020 (r550698)
+++ head/www/nginx-devel/Makefile Wed Sep 30 13:11:26 2020 (r550699)
@@ -3,6 +3,7 @@
PORTNAME?= nginx
PORTVERSION= 1.19.3
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= https://nginx.org/download/ \
LOCAL/osa
Modified: head/www/nginx-devel/Makefile.extmod
==============================================================================
--- head/www/nginx-devel/Makefile.extmod Wed Sep 30 12:52:41 2020 (r550698)
+++ head/www/nginx-devel/Makefile.extmod Wed Sep 30 13:11:26 2020 (r550699)
@@ -138,6 +138,7 @@ HTTP_NOTICE_VARS= DSO_EXTMODS+=notice
HTTP_PUSH_GH_TUPLE= slact:nchan:v1.2.7:push
HTTP_PUSH_VARS= DSO_EXTMODS+=push
+HTTP_PUSH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-nchan-store-private.h
HTTP_PUSH_STREAM_GH_TUPLE= wandenberg:nginx-push-stream-module:0.5.4:pushstream
HTTP_PUSH_STREAM_VARS= DSO_EXTMODS+=pushstream
Added: head/www/nginx-devel/files/extra-patch-nchan-store-private.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx-devel/files/extra-patch-nchan-store-private.h Wed Sep 30 13:11:26 2020 (r550699)
@@ -0,0 +1,10 @@
+--- ../nchan-1.2.7/src/store/memory/store-private.h.orig 2020-09-20 13:11:33.781569000 +0200
++++ ../nchan-1.2.7/src/store/memory/store-private.h 2020-09-20 13:11:48.679855000 +0200
+@@ -172,6 +172,6 @@
+ void memstore_chanhead_release(memstore_channel_head_t *ch, char *label);
+ void memstore_chanhead_reserve(memstore_channel_head_t *ch, const char *label);
+
+-uint16_t memstore_worker_generation; //times nginx has been restarted + 1
++extern uint16_t memstore_worker_generation; //times nginx has been restarted + 1
+
+ #endif /*MEMSTORE_PRIVATE_HEADER*/
More information about the svn-ports-head
mailing list