diff options
| author | Sergey A. Osokin <osa@FreeBSD.org> | 2020-09-30 13:11:26 +0000 |
|---|---|---|
| committer | Sergey A. Osokin <osa@FreeBSD.org> | 2020-09-30 13:11:26 +0000 |
| commit | e28bc67fc0a5ad8235a1e17cec996e865a8ae256 (patch) | |
| tree | 659281e37e41fa417db2352b1a54603db461fe70 /www/nginx-devel | |
| parent | Update to 4.8.0 (diff) | |
Merge r549093 to fix build with -fno-common.
Bump PORTREVISION.
Spotted by: vanilla
Notes
Notes:
svn path=/head/; revision=550699
Diffstat (limited to 'www/nginx-devel')
| -rw-r--r-- | www/nginx-devel/Makefile | 1 | ||||
| -rw-r--r-- | www/nginx-devel/Makefile.extmod | 1 | ||||
| -rw-r--r-- | www/nginx-devel/files/extra-patch-nchan-store-private.h | 10 |
3 files changed, 12 insertions, 0 deletions
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile index bbee9a19ef80..816199f4cc19 100644 --- a/www/nginx-devel/Makefile +++ b/www/nginx-devel/Makefile @@ -3,6 +3,7 @@ PORTNAME?= nginx PORTVERSION= 1.19.3 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= https://nginx.org/download/ \ LOCAL/osa diff --git a/www/nginx-devel/Makefile.extmod b/www/nginx-devel/Makefile.extmod index 91c1a83d22f4..623d2ecf06be 100644 --- a/www/nginx-devel/Makefile.extmod +++ b/www/nginx-devel/Makefile.extmod @@ -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 diff --git a/www/nginx-devel/files/extra-patch-nchan-store-private.h b/www/nginx-devel/files/extra-patch-nchan-store-private.h new file mode 100644 index 000000000000..72d3f5e75afd --- /dev/null +++ b/www/nginx-devel/files/extra-patch-nchan-store-private.h @@ -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*/ |