svn commit: r517639 - in head/www/nginx: . files
Jochen Neumeister
joneum at FreeBSD.org
Fri Nov 15 09:15:06 UTC 2019
Author: joneum
Date: Fri Nov 15 09:15:04 2019
New Revision: 517639
URL: https://svnweb.freebsd.org/changeset/ports/517639
Log:
This fix a Problem when PASSENGER=on
src/cxx_supportlib/oxt/system_calls.cpp:135:9: note: expanded from macro 'CHECK_INTERRUPTION'
&& (!this_thread::syscalls_interruptable() \
^
/usr/include/c++/v1/__threading_support:465:11: note: candidate found by name lookup is 'std::__1::this_thread'
namespace this_thread
^
src/cxx_supportlib/vendor-modified/boost/thread/pthread/condition_variable.hpp:30:15: note: candidate found by name lookup is 'boost::this_thread'
namespace this_thread
PR: 241753
Submitted by: yani at pi-greece.eu
Reported by: linus.sundqvist at loopia.se
Sponsored by: Netzkommune GmbH
Added:
head/www/nginx/files/extra-patch-passenger-system-calls (contents, props changed)
Modified:
head/www/nginx/Makefile.extmod
Modified: head/www/nginx/Makefile.extmod
==============================================================================
--- head/www/nginx/Makefile.extmod Fri Nov 15 09:07:17 2019 (r517638)
+++ head/www/nginx/Makefile.extmod Fri Nov 15 09:15:04 2019 (r517639)
@@ -247,7 +247,8 @@ PASSENGER_DISTFILES= passenger-${PASSENGER_NGINX_VER}.
PASSENGER_VARS= WRKSRC_passenger=${WRKDIR}/passenger-${PASSENGER_NGINX_VER} \
DSO_EXTDIRS+=passenger-${PASSENGER_NGINX_VER}/src/nginx_module
PASSENGER_EXTRA_PATCHES=${PATCHDIR}/extra-patch-passenger-build-nginx.rb \
- ${PATCHDIR}/extra-patch-passenger-disable-telemetry
+ ${PATCHDIR}/extra-patch-passenger-disable-telemetry \
+ ${PATCHDIR}/extra-patch-passenger-system-calls
POSTGRES_USES= pgsql
POSTGRES_GH_TUPLE= FRiCKLE:ngx_postgres:1.0rc7:postgres
Added: head/www/nginx/files/extra-patch-passenger-system-calls
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/www/nginx/files/extra-patch-passenger-system-calls Fri Nov 15 09:15:04 2019 (r517639)
@@ -0,0 +1,52 @@
+--- ../passenger-6.0.4/src/cxx_supportlib/oxt/system_calls.cpp.original 2019-11-15 01:35:57.674449000 +0200
++++ ../passenger-6.0.4/src/cxx_supportlib/oxt/system_calls.cpp 2019-11-15 01:36:06.053234000 +0200
+@@ -132,15 +132,15 @@
+ _my_errno = errno; \
+ } while ((error_expression) \
+ && _my_errno == EINTR \
+- && (!this_thread::syscalls_interruptable() \
+- || !(_intr_requested = this_thread::interruption_requested())) \
++ && (!boost::this_thread::syscalls_interruptable() \
++ || !(_intr_requested = boost::this_thread::interruption_requested())) \
+ ); \
+ if (OXT_LIKELY(ctx != NULL)) { \
+ ctx->syscall_interruption_lock.lock(); \
+ } \
+ if ((error_expression) \
+ && _my_errno == EINTR \
+- && this_thread::syscalls_interruptable() \
++ && boost::this_thread::syscalls_interruptable() \
+ && _intr_requested) { \
+ throw thread_interrupted(); \
+ } \
+@@ -284,8 +284,8 @@
+ }
+ if (ret == -1
+ && errno == EINTR
+- && this_thread::syscalls_interruptable()
+- && this_thread::interruption_requested()) {
++ && boost::this_thread::syscalls_interruptable()
++ && boost::this_thread::interruption_requested()) {
+ throw thread_interrupted();
+ } else {
+ return ret;
+@@ -662,8 +662,8 @@
+ }
+ } while (ret == -1
+ && e == EINTR
+- && (!this_thread::syscalls_interruptable()
+- || !(intr_requested = this_thread::interruption_requested()))
++ && (!boost::this_thread::syscalls_interruptable()
++ || !(intr_requested = boost::this_thread::interruption_requested()))
+ );
+
+ if (OXT_UNLIKELY(ctx != NULL)) {
+@@ -672,7 +672,7 @@
+
+ if (ret == -1
+ && e == EINTR
+- && this_thread::syscalls_interruptable()
++ && boost::this_thread::syscalls_interruptable()
+ && intr_requested) {
+ throw thread_interrupted();
+ }
More information about the svn-ports-all
mailing list