<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a8f179575f70f0d21dfbaef7a9003cbcb43b59bb">https://github.com/macports/macports-ports/commit/a8f179575f70f0d21dfbaef7a9003cbcb43b59bb</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 a8f1795 haproxy: disable threads on older systems without thread-local storage support
</span>a8f1795 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a8f179575f70f0d21dfbaef7a9003cbcb43b59bb
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Sun Jun 24 09:20:08 2018 +0000
<span style='display:block; white-space:pre;color:#404040;'> haproxy: disable threads on older systems without thread-local storage support
</span>---
net/haproxy/Portfile | 5 ++++
.../files/patch-unbreak-build-without-threads.diff | 33 ++++++++++++++++++++++
2 files changed, 38 insertions(+)
<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 cdd84d6..015267a 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;'>@@ -47,6 +47,11 @@ build.args CC="${configure.cc} [get_canonical_archflags]" \
</span> USE_THREAD=1 \
USE_ZLIB=1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-delete USE_THREAD=1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-unbreak-build-without-threads.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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-unbreak-build-without-threads.diff b/net/haproxy/files/patch-unbreak-build-without-threads.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7ebd5cb
</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-unbreak-build-without-threads.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 0611c65b8e1c9c7c9f0f16c1542be904236c3fa7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: William Lallemand <wlallem...@haproxy.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Sun, 24 Jun 2018 09:37:03 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] BUG/BUILD: threads: unbreak build without threads
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+The build without threads was once again broken.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This issue was introduce in commit ba86c6c ("MINOR: threads: Be sure to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+remove threads from all_threads_mask on exit").
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This exactly the same problem that the last time it happened, because of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+all_threads_mask not being defined with USE_THREAD=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/haproxy.c | 3 +--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/haproxy.c src/haproxy.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 11d1d47ce..4101cefa1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/haproxy.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/haproxy.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2473,9 +2473,8 @@ static void *run_thread_poll_loop(void *data)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ list_for_each_entry(ptdf, &per_thread_deinit_list, list)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ptdf->fct();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- HA_ATOMIC_AND(&all_threads_mask, ~tid_bit);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef USE_THREAD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ HA_ATOMIC_AND(&all_threads_mask, ~tid_bit);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (tid > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pthread_exit(NULL);
</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;'>+2.16.1
</span></pre><pre style='margin:0'>
</pre>