<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b6d4b81c19f788976f27aa412c444626b8d8b963">https://github.com/macports/macports-ports/commit/b6d4b81c19f788976f27aa412c444626b8d8b963</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b6d4b81c19f788976f27aa412c444626b8d8b963
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Mar 19 18:59:19 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> php-swoole: Fix build without clock_gettime
</span>---
php/php-swoole/Portfile | 1 +
php/php-swoole/files/timer.patch | 31 +++++++++++++++++++++++++++++++
2 files changed, 32 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-swoole/Portfile b/php/php-swoole/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7b458c3f2ee..c2db2fbe891 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-swoole/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-swoole/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,6 +18,7 @@ if {[vercmp ${php.branch} 7.2] >= 0} {
</span> checksums rmd160 16b6ae49390c789ab963c5426163a43869090447 \
sha256 ca888cb886c883092ebe8788253d600bc52c384e74e27110f97b04ecea6b6fda \
size 1851160
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append timer.patch
</span> } elseif {[vercmp ${php.branch} 7.1] >= 0} {
version 4.5.11
revision 1
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-swoole/files/timer.patch b/php/php-swoole/files/timer.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b01fac7a3f8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-swoole/files/timer.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix build failure on systems without clock_gettime.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/core/timer.cc.orig 2022-02-24 08:50:47.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/core/timer.cc 2022-03-19 18:46:11.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -243,8 +243,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return SW_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if defined(SW_USE_MONOTONIC_TIME) && defined(CLOCK_MONOTONIC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int Timer::now(struct timeval *time) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(SW_USE_MONOTONIC_TIME) && defined(CLOCK_MONOTONIC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ struct timespec _now;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (clock_gettime(CLOCK_MONOTONIC, &_now) < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ swoole_sys_warning("clock_gettime(CLOCK_MONOTONIC) failed");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -253,12 +253,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ time->tv_sec = _now.tv_sec;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ time->tv_usec = _now.tv_nsec / 1000;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (gettimeofday(time, nullptr) < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- swoole_sys_warning("gettimeofday() failed");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return SW_ERR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (gettimeofday(time, nullptr) < 0) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ swoole_sys_warning("gettimeofday() failed");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return SW_ERR;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return SW_OK;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-} // namespace swoole
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }; // namespace swoole
</span></pre><pre style='margin:0'>
</pre>