diff options
| author | schmonz <schmonz@pkgsrc.org> | 2020-08-12 20:00:30 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2020-08-12 20:00:30 +0000 |
| commit | 2cf9c952d6c1921517b7d086a04fb36c2a7d4cd7 (patch) | |
| tree | 0fa5833edc9fb126a1219acc001c91a20e4be680 /mail/rspamd | |
| parent | b67aee7f3a351e9050c314b7a6190ad8ad9b904f (diff) | |
| download | pkgsrc-2cf9c952d6c1921517b7d086a04fb36c2a7d4cd7.tar.gz | |
Set CMAKE_INSTALL_NAME_DIR to lib/rspamd so that shlibs are built with
correct install_name_tool -id on macOS, where this fixes CHECK_SHLIBS
(and probably runtime behavior too). While here, the patch to link with
-lrt on NetBSD has been upstreamed; remove. Bump PKGREVISION.
Diffstat (limited to 'mail/rspamd')
| -rw-r--r-- | mail/rspamd/Makefile | 10 | ||||
| -rw-r--r-- | mail/rspamd/distinfo | 3 | ||||
| -rw-r--r-- | mail/rspamd/patches/patch-src_CMakeLists.txt | 14 |
3 files changed, 6 insertions, 21 deletions
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile index 1b73459d5fd..e3186cf9739 100644 --- a/mail/rspamd/Makefile +++ b/mail/rspamd/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.68 2020/08/08 14:35:37 wiz Exp $ +# $NetBSD: Makefile,v 1.69 2020/08/12 20:00:30 schmonz Exp $ DISTNAME= rspamd-2.5 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_GITHUB:=vstakhov/} @@ -24,10 +24,10 @@ BUILD_DEFS+= VARBASE LUA_VERSIONS_ACCEPTED= 53 CPPFLAGS.SunOS+= -D__EXTENSIONS__ -BUILDLINK_TRANSFORM.Darwin+= rm:-lrt -LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/rspamd -TEST_TARGET= run-test +CMAKE_INSTALL_NAME_DIR= ${PREFIX}/lib/rspamd +LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/rspamd +TEST_TARGET= run-test RSPAMD_USER?= rspamd RSPAMD_GROUP?= rspamd diff --git a/mail/rspamd/distinfo b/mail/rspamd/distinfo index 7fcbed2acfb..4636b240202 100644 --- a/mail/rspamd/distinfo +++ b/mail/rspamd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.33 2020/05/18 11:10:56 nia Exp $ +$NetBSD: distinfo,v 1.34 2020/08/12 20:00:30 schmonz Exp $ SHA1 (rspamd-2.5.tar.gz) = e3c3afb0cbdb50763421be73d7d3cab187a8fdb5 RMD160 (rspamd-2.5.tar.gz) = a6ae3429f5b439e8067b7b50bd3b5f55d72101f5 @@ -7,4 +7,3 @@ Size (rspamd-2.5.tar.gz) = 4490310 bytes SHA1 (patch-CMakeLists.txt) = b0b0dd855351acb68793d84896101e1c424b7ded SHA1 (patch-cmake_Toolset.cmake) = d4900720b85a8e3078c4fdaa76757fcbbd4f89bd SHA1 (patch-contrib_fpconv_fpconv.c) = b1ec2b07570674458e69020ccbf25f0374d894f6 -SHA1 (patch-src_CMakeLists.txt) = 672873307ee1f30236e53298a6c0d422c7a79b0e diff --git a/mail/rspamd/patches/patch-src_CMakeLists.txt b/mail/rspamd/patches/patch-src_CMakeLists.txt deleted file mode 100644 index 28e39cbfb1d..00000000000 --- a/mail/rspamd/patches/patch-src_CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-src_CMakeLists.txt,v 1.3 2019/12/08 09:32:05 triaxx Exp $ - ---- src/CMakeLists.txt.orig 2019-11-19 17:31:43.000000000 +0000 -+++ src/CMakeLists.txt -@@ -186,6 +186,9 @@ TARGET_LINK_LIBRARIES(rspamd-server lcbt - TARGET_LINK_LIBRARIES(rspamd-server rspamd-zstd) - TARGET_LINK_LIBRARIES(rspamd-server rspamd-fastutf8) - -+# for shm_open -+TARGET_LINK_LIBRARIES(rspamd-server rt) -+ - IF (ENABLE_CLANG_PLUGIN MATCHES "ON") - ADD_DEPENDENCIES(rspamd-server rspamd-clang) - ENDIF() |