<pre style='margin:0'>
Vadym-Valdis Yudaiev (judaew) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/faee4c50aca537f46546013b6e81bdb8033faab4">https://github.com/macports/macports-ports/commit/faee4c50aca537f46546013b6e81bdb8033faab4</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new faee4c50aca haproxy: fix build for older OSs Fixes: https://trac.macports.org/ticket/65699
</span>faee4c50aca is described below
<span style='display:block; white-space:pre;color:#808000;'>commit faee4c50aca537f46546013b6e81bdb8033faab4
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Sat Aug 20 23:39:37 2022 +0800
<span style='display:block; white-space:pre;color:#404040;'> haproxy: fix build for older OSs
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/65699
</span>---
net/haproxy/Portfile | 13 +++++++++----
net/haproxy/files/patch-older_systems.diff | 22 ++++++++++++++++++++++
2 files changed, 31 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/haproxy/Portfile b/net/haproxy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index be3cc6781a5..4f1db3a7b77 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/haproxy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/haproxy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,6 +37,11 @@ checksums rmd160 d88ec423262399e4f275320b26b8e2c843048a43 \
</span> openssl.branch 3
depends_lib port:pcre port:zlib
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/65699
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.thread_local_storage yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-older_systems.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
# Disable compiler wrapping
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,15 +64,15 @@ pre-build {
</span> USE_ZLIB=1
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 15} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append USE_TFO=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant lua description {Build with Lua support} {
depends_lib-append port:lua
build.args-append USE_LUA=1
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-delete USE_THREAD=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> destroot.args DOCDIR=${prefix}/share/doc/${name} \
PREFIX=${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/haproxy/files/patch-older_systems.diff b/net/haproxy/files/patch-older_systems.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..024c5418622
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/haproxy/files/patch-older_systems.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/65699
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/haproxy/compat.h.orig 2022-08-19 23:29:02.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/haproxy/compat.h 2022-08-20 23:13:25.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -281,13 +281,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* macOS has a call similar to malloc_usable_size */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <malloc/malloc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define malloc_usable_size malloc_size
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED > 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define HA_HAVE_MALLOC_ZONE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define TCP_KEEPIDLE TCP_KEEPALIVE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED > 101003
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define TCP_INFO TCP_CONNECTION_INFO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define tcp_info tcp_connection_info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Max number of file descriptors we send in one sendmsg(). Linux seems to be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * able to send 253 fds per sendmsg(), however musl is limited to 252, not sure
</span></pre><pre style='margin:0'>
</pre>