freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build on FreeBSD13.

Browse Source 
Bump PORTREVISION.

Original patch:	d0d660bbdb.patch
Thanks to:	Camden Narzt <support@phusionpassenger.com>
This commit is contained in:
Sergey A. Osokin
2019-09-19 21:09:13 +00:00
parent 64b6aaba4c
commit cc89420177
2 changed files with 92 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
www/rubygem-passenger/Makefile
View File

@@ -3,6 +3,7 @@
PORTNAME= passenger
PORTVERSION= 6.0.4
PORTREVISION= 1
CATEGORIES= www rubygems
MASTER_SITES= RG
PKGNAMEPREFIX= rubygem-

91
www/rubygem-passenger/files/patch-freebsd13 Normal file
View File

@@ -0,0 +1,91 @@
--- src/agent/Core/ApplicationPool/Pool/GarbageCollection.cpp.orig 2019-09-19 16:54:40.089339000 -0400
+++ src/agent/Core/ApplicationPool/Pool/GarbageCollection.cpp 2019-09-19 16:54:58.167526000 -0400
@@ -55,7 +55,7 @@
self->garbageCollectionCond.timed_wait(lock,
posix_time::seconds(5));
}
- while (!this_thread::interruption_requested()) {
+ while (!boost::this_thread::interruption_requested()) {
try {
UPDATE_TRACE_POINT();
unsigned long long sleepTime = self->realGarbageCollect();
--- src/agent/Core/ApplicationPool/Group/ProcessListManagement.cpp.orig 2019-09-19 16:53:35.309791000 -0400
+++ src/agent/Core/ApplicationPool/Group/ProcessListManagement.cpp 2019-09-19 16:53:59.509027000 -0400
@@ -305,7 +305,7 @@
while (true) {
assert(detachedProcessesCheckerActive);
- if (getLifeStatus() == SHUT_DOWN || this_thread::interruption_requested()) {
+ if (getLifeStatus() == SHUT_DOWN || boost::this_thread::interruption_requested()) {
UPDATE_TRACE_POINT();
P_DEBUG("Stopping detached processes checker");
detachedProcessesCheckerActive = false;
--- src/cxx_supportlib/oxt/system_calls.cpp.orig 2019-09-19 17:00:06.903986000 -0400
+++ src/cxx_supportlib/oxt/system_calls.cpp 2019-09-19 17:02:32.106158000 -0400
@@ -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();
}
@@ -748,14 +748,14 @@
* http://stackoverflow.com/questions/20410943/segmentation-fault-when-accessing-statically-initialized-thread-variable?noredirect=1#comment30483943_20410943
* https://bugzilla.redhat.com/show_bug.cgi?id=731228
*/
- __thread int this_thread::_syscalls_interruptable = 1;
+ __thread int boost::this_thread::_syscalls_interruptable = 1;
bool
boost::this_thread::syscalls_interruptable() {
return _syscalls_interruptable;
}
#else
- boost::thread_specific_ptr<bool> this_thread::_syscalls_interruptable;
+ boost::thread_specific_ptr<bool> boost::this_thread::_syscalls_interruptable;
bool
boost::this_thread::syscalls_interruptable() {