<pre style='margin:0'>
Chris Jones (cjones051073) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/00cf8a72e451a59e5d71433c06f5a734f64422a8">https://github.com/macports/macports-ports/commit/00cf8a72e451a59e5d71433c06f5a734f64422a8</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 00cf8a7 rspamd: Fixed build for macOS and improved Portfile
</span>00cf8a7 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 00cf8a72e451a59e5d71433c06f5a734f64422a8
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Fri May 3 22:43:54 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> rspamd: Fixed build for macOS and improved Portfile
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Build fixes segmentaton fault and -DCMAKE_OSX_ARCHITECTURES issues
</span><span style='display:block; white-space:pre;color:#404040;'> * Add port:libstemmer and port:libunwind dependencies
</span><span style='display:block; white-space:pre;color:#404040;'> * Organize dependencies in the correct sections
</span><span style='display:block; white-space:pre;color:#404040;'> * https://github.com/rspamd/rspamd/issues/2884
</span><span style='display:block; white-space:pre;color:#404040;'> * https://github.com/rspamd/rspamd/issues/2883
</span><span style='display:block; white-space:pre;color:#404040;'> * https://github.com/macports/macports-ports/commit/857c47b3beba97eb7e9934c5bff6e8982bf44307
</span><span style='display:block; white-space:pre;color:#404040;'> * https://trac.macports.org/ticket/58437
</span>---
mail/rspamd/Portfile | 79 ++++++++++++++++++++++++++++++++++++----------------
1 file changed, 55 insertions(+), 24 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/rspamd/Portfile b/mail/rspamd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 703f146..42bc2cf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/rspamd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/rspamd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup cxx11 1.1
github.setup rspamd rspamd 1.9.2
<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 mail
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,9 +21,6 @@ long_description ${description} Rspamd core is written in C language using e
</span> paradigma. Plugins for rspamd can be written in lua. Rspamd is designed to \
process connections completely asynchronous and do not block anywhere in code.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Necessary to address this issue: https://trac.macports.org/ticket/47197
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.out_of_source no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> checksums rmd160 a8dd52a6ede4c52289b23a69d3ea80602e46696e \
sha256 dd1d8e9cdbb1c870be3c1bfee57a6894b6f8174595bc0684212a7c1afa4439f0 \
size 4460935
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,23 +29,35 @@ compiler.blacklist-append *gcc* {clang < 800}
</span> compiler.whitelist clang macports-clang-8.0 macports-clang-7.0 macports-clang-6.0 macports-clang-5.0
depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:luajit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ragel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:pkgconfig
</span>
depends_lib-append port:libevent \
port:libmagic \
port:sqlite3 \
port:openssl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/libopenblas.dylib:OpenBLAS \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:ragel \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:luajit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libstemmer \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:fann \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:gd2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libunwind \
</span> port:gmime \
port:lua \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pcre \
</span> port:perl5 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:zlib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ path:lib/libopenblas.dylib:OpenBLAS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append \
</span> port:redis \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:hiredis \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:hiredis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Critical dependency note: port:pcre and port:pcre2 break the rspamd binary;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# use native /usr/lib/libpcre.dylib. See https://github.com/rspamd/rspamd/issues/2884
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Do not use the library provided by port:pcre without pcre jit debugging
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Do not use -DENABLE_PCRE2=ON without pcre jit debugging
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# # depends_build-append port:pcre
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# # depends_build-append port:pcre2
</span>
set rspamd_user _rspamd
set rspamd_group ${rspamd_user}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,26 +65,48 @@ add_users ${rspamd_user} group=${rspamd_group} realname=Rspamd
</span>
libpath ${prefix}/var/lib/${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# -DCMAKE_OSX_ARCHITECTURES="x86_64" causes the "Symbol not found: _blake2b_blocks_x86" error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# See https://github.com/rspamd/rspamd/issues/2883
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.set_osx_architectures no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Reference: https://github.com/rspamd/rspamd/blob/master/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Also see https://github.com/rspamd/rspamd/issues/2884
</span> configure.args-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPCRE_ROOT_DIR=/usr/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_LUAJIT=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_TORCH=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_SNOWBALL=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_FANN=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_GD=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_LIBUNWIND=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DNO_SHARED=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DINSTALL_EXAMPLES=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
</span> -DRSPAMD_USER=${rspamd_user} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DRSPAMD_GROUP=${rspamd_group} \
</span> -DCMAKE_INSTALL_PREFIX=${prefix} \
-DCONFDIR=${prefix}/etc/${name} \
-DMANDIR=${prefix}/share/man \
-DRUNDIR=${prefix}/var/run/${name} \
-DDBDIR=${prefix}/var/lib/${name} \
-DLOGDIR=${prefix}/var/log/${name} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DLIBDIR=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DBUILD_PORT:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_LUAJIT=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DCMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DNO_SHARED=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DINSTALL_EXAMPLES=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This will need its own macport, see https://github.com/intel/hyperscan
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # -DENABLE_HYPERSCAN=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_FANN=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_PCRE2=ON \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -DENABLE_GD=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIBDIR=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Critical dependency note: port:pcre and port:pcre2 break the rspamd binary;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# use native /usr/lib/libpcre.dylib. See https://github.com/rspamd/rspamd/issues/2884
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DPCRE_ROOT_DIR=/usr/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Do not use -DENABLE_PCRE2=ON without pcre jit debugging
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# # configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# # -DENABLE_PCRE2=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This option will need its own macport, see https://github.com/intel/hyperscan
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -DENABLE_HYPERSCAN=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Build with -DENABLE_FULL_DEBUG=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -DENABLE_FULL_DEBUG=ON
</span>
test.run yes
test.target run-test
</pre><pre style='margin:0'>
</pre>