mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2026-05-06 04:46:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

community/rspamd: change to lua for non x86

Browse Source 
* fixes #11340

delete unneeded line

fix typo
This commit is contained in:
Duncan Bellamy 2020-11-07 11:30:37 +00:00 committed by Leo
parent a692726c23
commit 628eebaacb
2 changed files with 39 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
community/rspamd/09-lua-suffix.patch Normal file
View File

@ -0,0 +1,28 @@
add .so.0 suffix so can find liblua
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,6 +122,7 @@
LIST(APPEND RSPAMD_REQUIRED_LIBRARIES "m")
LIST(APPEND RSPAMD_REQUIRED_LIBRARIES "pthread")
+SET(OLD_FIND_LIBRARY_SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES}")
IF(ENABLE_LUAJIT MATCHES "ON")
ProcessPackage(LIBLUAJIT LIBRARY "luajit"
"luajit-2.1"
@@ -138,6 +139,7 @@
SET(WITH_LUAJIT 1)
ELSE(ENABLE_LUAJIT MATCHES "ON")
+ SET(CMAKE_FIND_LIBRARY_SUFFIXES "${CMAKE_FIND_LIBRARY_SUFFIXES};.so.0")
ProcessPackage(LIBLUA LIBRARY "lua"
"lua-5.3"
INCLUDE lua.h INCLUDE_SUFFIXES
@@ -174,6 +176,7 @@
ENDIF()
ENDIF()
ENDIF(ENABLE_LUAJIT MATCHES "ON")
+SET(CMAKE_FIND_LIBRARY_SUFFIXES "${OLD_FIND_LIBRARY_SUFFIXES}")
IF(ENABLE_JEMALLOC MATCHES "ON" AND NOT SANITIZE)
ProcessPackage(JEMALLOC LIBRARY jemalloc_pic jemalloc INCLUDE jemalloc.h INCLUDE_SUFFIXES include/jemalloc

17
community/rspamd/APKBUILD
View File

@ -6,7 +6,7 @@
# Contributor: Duncan Bellamy <dunk@denkimushi.com>
pkgname=rspamd
pkgver=2.6
pkgrel=1
pkgrel=2
pkgdesc="Fast, free and open-source spam filtering system"
url="https://rspamd.com/"
arch="all"
@ -24,7 +24,6 @@ makedepends="
libevent-dev
libsodium-dev
openssl-dev
luajit-dev
pcre2-dev
perl
ragel
@ -50,14 +49,18 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/rspamd/rspamd/archive/$pkgve
30-conf-split-workers.patch
20-default-configs.patch
10-control_socket.patch
09-lua-suffix.patch
"
case "$CARCH" in
x86|x86_64)
makedepends="$makedepends hyperscan-dev"
_hm="ON" ;;
makedepends="$makedepends luajit-dev hyperscan-dev"
_hm="ON"
_jit="ON" ;;
*)
_hm="OFF" ;;
makedepends="$makedepends lua5.3-dev"
_hm="OFF"
_jit="OFF" ;;
esac
build() {
@ -75,6 +78,7 @@ build() {
-DENABLE_URL_INCLUDE=ON \
-DENABLE_PCRE2=ON \
-DENABLE_HYPERSCAN="$_hm" \
-DENABLE_LUAJIT="$_jit" \
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
-DCMAKE_C_FLAGS="$CFLAGS" \
"$CMAKE_CROSSOPTS" .
@ -171,4 +175,5 @@ sha512sums="79e4c1aa763aef753c8d7b2a941ed92b384e96c25e6d1b3bd1321c5acc0ecb934d03
a2003ef0c9d64a44480f59302864a2dfedcbe3a0047fcbb655408bc8aae9014b6ad0ddc6b64d4abeeb21bea0f86678afd30589ac8eed83e07ad7f87710e93702 rspamd.confd
a8aefee649bf6630339d1d3f2bb20c25ca70b21a8eaa92951e926d0fd4525f1d4ac4cc7ea66ac2b15323cf02c93c759ddf7181502f0d71b21384ced9d88c008e 30-conf-split-workers.patch
8801e3af59886847c25c87ca2f231cd9ededf35f376f9920967e72696fb017b1a4312f3a49017b52f65556bfe5c9f74a80405643afa32bb2906c38d39c5e1818 20-default-configs.patch
6f828601ce460f2fd3b1c430974b719e36b0aa5600bd7074683fd646d99a4e76da35840b54c50416a9ae6d87babe39c5d463fc2ec05814e164a96d16f5da18b7 10-control_socket.patch"
6f828601ce460f2fd3b1c430974b719e36b0aa5600bd7074683fd646d99a4e76da35840b54c50416a9ae6d87babe39c5d463fc2ec05814e164a96d16f5da18b7 10-control_socket.patch
7d58ef3e01fd7251cdd7af0fd489c329177e9af75fac493a80255acc7c29f823f8ed93a054bb310c83258ccae79691b3c655c1fd3e8b4638bc9281519a2f2c2a 09-lua-suffix.patch"