Date: Wed, 8 Apr 2015 19:27:21 +0300 From: Sergey Kandaurov <pluknet@nginx.com> To: svn-ports-all@freebsd.org Subject: Re: svn commit: r383552 - head/www/nginx-devel Message-ID: <5D3E2373-9726-44E2-9E14-3EE87E494496@nginx.com>
next in thread | raw e-mail | index | archive | help
This patch for ports only should fix most of bad behaving 3rd party =
modules
when building --with-threads. Namely mogilefs, lua, and sflow still =
mock
into NGX_THREADS long obsolete non-functionality. I have a larger =
patchset
for fixing individual modules but doubt it's worth due maintenance cost.
Also your change looks premature as all affected modules should build =
fine
without =97with-threads.
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- Makefile (revision 383562)
+++ Makefile (working copy)
@@ -802,6 +802,7 @@
=20
.if ${PORT_OPTIONS:MTHREADS}
CONFIGURE_ARGS+=3D--with-threads
+EXTRA_PATCHES+=3D ${PATCHDIR}/extra-patch-src-core-ngx_core.h:-p1
.endif
=20
.if ${PORT_OPTIONS:MWWW}
Index: files/extra-patch-src-core-ngx_core.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- files/extra-patch-src-core-ngx_core.h (revision 0)
+++ files/extra-patch-src-core-ngx_core.h (working copy)
@@ -0,0 +1,23 @@
+# HG changeset patch
+# User Sergey Kandaurov <pluknet@nginx.com>
+# Date 1428508123 -10800
+# Wed Apr 08 18:48:43 2015 +0300
+# Node ID 65d38c30e10436046b55129c9666a3f361a3ca5e
+# Parent f737e406aa681a24074b3a792c01c864afe750ee
+Core: ensure that ngx_config.h is always included first.
+
+Otherwise, bad things can happen, notably seen in 3rd party modules.
+
+diff -r f737e406aa68 -r 65d38c30e104 src/core/ngx_core.h
+--- a/src/core/ngx_core.h Thu Mar 26 14:15:06 2015 +0300
++++ b/src/core/ngx_core.h Wed Apr 08 18:48:43 2015 +0300
+@@ -9,6 +9,9 @@
+ #define _NGX_CORE_H_INCLUDED_
+=20
+=20
++#include <ngx_config.h>
++
++
+ typedef struct ngx_module_s ngx_module_t;
+ typedef struct ngx_conf_s ngx_conf_t;
+ typedef struct ngx_cycle_s ngx_cycle_t;
--=20
Sergey Kandaurov
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5D3E2373-9726-44E2-9E14-3EE87E494496>