From owner-svn-ports-all@FreeBSD.ORG  Wed Apr  8 16:27:27 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 1B1C3204
 for <svn-ports-all@freebsd.org>; Wed,  8 Apr 2015 16:27:27 +0000 (UTC)
Received: from mail.nginx.com (mail.nginx.com [206.251.255.65])
 (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 0415F19D
 for <svn-ports-all@freebsd.org>; Wed,  8 Apr 2015 16:27:26 +0000 (UTC)
Received: from [192.168.33.77] (unknown [178.23.225.78])
 (using TLSv1 with cipher AES128-SHA (128/128 bits))
 (Client did not present a certificate)
 by mail.nginx.com (Postfix) with ESMTPSA id 0E3EF3FA7A6
 for <svn-ports-all@freebsd.org>; Wed,  8 Apr 2015 16:27:24 +0000 (UTC)
From: Sergey Kandaurov <pluknet@nginx.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: quoted-printable
Subject: Re: svn commit: r383552 - head/www/nginx-devel
Message-Id: <5D3E2373-9726-44E2-9E14-3EE87E494496@nginx.com>
Date: Wed, 8 Apr 2015 19:27:21 +0300
To: svn-ports-all@freebsd.org
Mime-Version: 1.0 (Mac OS X Mail 7.3 \(1878.6\))
X-Mailer: Apple Mail (2.1878.6)
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 08 Apr 2015 16:27:27 -0000

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