Date: Sun, 20 Sep 2020 11:42:46 +0000 (UTC) From: =?UTF-8?Q?Stefan_E=c3=9fer?= <se@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549093 - in head/www: nginx nginx-full nginx/files Message-ID: <202009201142.08KBgk3H033402@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: se Date: Sun Sep 20 11:42:45 2020 New Revision: 549093 URL: https://svnweb.freebsd.org/changeset/ports/549093 Log: Fix build of www/nginx-full with -fno-common This fix should also apply to www/nginx built with option HTTP_PUSH, but the compilation fails with: error: no member named 'sockaddr' in 'struct redisContext' This seems to be an unrelated issue and I have not tried to diagnose it, yet. The PORTREVISION is only bumped for www/nginx-full, which built for me with this patch applied. Added: head/www/nginx/files/extra-patch-nchan-store-private.h (contents, props changed) Modified: head/www/nginx-full/Makefile head/www/nginx/Makefile.extmod Modified: head/www/nginx-full/Makefile ============================================================================== --- head/www/nginx-full/Makefile Sun Sep 20 11:36:50 2020 (r549092) +++ head/www/nginx-full/Makefile Sun Sep 20 11:42:45 2020 (r549093) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= nginx -PORTREVISION= 4 +PORTREVISION= 5 PKGNAMESUFFIX= -full MAINTAINER= robak@FreeBSD.org Modified: head/www/nginx/Makefile.extmod ============================================================================== --- head/www/nginx/Makefile.extmod Sun Sep 20 11:36:50 2020 (r549092) +++ head/www/nginx/Makefile.extmod Sun Sep 20 11:42:45 2020 (r549093) @@ -137,6 +137,7 @@ HTTP_NOTICE_VARS= DSO_EXTMODS+=notice HTTP_PUSH_GH_TUPLE= slact:nchan:v1.1.14: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/files/extra-patch-nchan-store-private.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/nginx/files/extra-patch-nchan-store-private.h Sun Sep 20 11:42:45 2020 (r549093) @@ -0,0 +1,10 @@ +--- ../nchan-1.1.14/src/store/memory/store-private.h.orig 2020-09-20 13:11:33.781569000 +0200 ++++ ../nchan-1.1.14/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*/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009201142.08KBgk3H033402>