<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e28fcd3cff1a874ed7da2bb2008e6b26b88f0f1c">https://github.com/macports/macports-ports/commit/e28fcd3cff1a874ed7da2bb2008e6b26b88f0f1c</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 e28fcd3cff1 wrk: fix build for arm64
</span>e28fcd3cff1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e28fcd3cff1a874ed7da2bb2008e6b26b88f0f1c
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sat Nov 13 18:31:31 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> wrk: fix build for arm64
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> THis is a tricky fix. `wrk` ships with `openssl` and `luajit`, and used
</span><span style='display:block; white-space:pre;color:#404040;'> version of `openssl` hasn't got support of arm64.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Here I've switched `wrk` to use MacPorts version of `openssl` and
</span><span style='display:block; white-space:pre;color:#404040;'> `luajit` that allows to build it on arm64 without any issue.
</span>---
net/wrk/Portfile | 31 ++++++++++++++++++++++---------
1 file changed, 22 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/wrk/Portfile b/net/wrk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ed2072a0889..82f5db5a584 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/wrk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/wrk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,9 +4,10 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup compilers 1.0
PortGroup xcode_workaround 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup openssl 1.0
</span>
github.setup wg wrk 4.1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
categories net
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,21 +21,33 @@ checksums rmd160 66508bc4bea66d7731510164037beaac5fe44de5 \
</span> sha256 49c309c834c484243d1f381505e7723326c5a9b6e328d88adef9ead804c8d83e \
size 6478150
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append port:perl5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:perl5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:luajit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|WITH_LUAJIT)/include|WITH_LUAJIT)/include/luajit-2.1|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# https://trac.macports.org/ticket/59346
<span style='display:block; white-space:pre;background:#ffe0e0;'>-xcode_workaround.type append_to_compiler_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+xcode_workaround.type \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ append_to_compiler_name
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPP=${configure.cpp} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VER=${version}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append CC="${configure.cc}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX="${configure.cxx}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPP=${configure.cpp} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VER=${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target-append WITH_LUAJIT=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WITH_OPENSSL=[openssl::install_area]
</span>
# Avoid configure phase
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure no
</span>
# wrk make fails with parallel build
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_parallel_build no
</span>
# No make install so copy static binary to bin dir
destroot {
</pre><pre style='margin:0'>
</pre>