Merge pull request #68653 from WilliButz/rspamd/fix-aarch64-segfault
rspamd: disable LuaJIT support on aarch64 [ZHF 19.93]
This commit is contained in:
commit
4fb48f9f6b
|
@ -1,10 +1,11 @@
|
||||||
{ stdenv, lib, fetchFromGitHub, cmake, perl
|
{ stdenv, lib, fetchFromGitHub, cmake, perl
|
||||||
, file, glib, libevent, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu
|
, file, glib, libevent, luajit, openssl, pcre, pkgconfig, sqlite, ragel, icu
|
||||||
, hyperscan, libfann, gd, jemalloc, openblas
|
, hyperscan, libfann, gd, jemalloc, openblas, lua
|
||||||
, withFann ? true
|
, withFann ? true
|
||||||
, withGd ? false
|
, withGd ? false
|
||||||
, withBlas ? true
|
, withBlas ? true
|
||||||
, withHyperscan ? stdenv.isx86_64
|
, withHyperscan ? stdenv.isx86_64
|
||||||
|
, withLuaJIT ? stdenv.isx86_64
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert withHyperscan -> stdenv.isx86_64;
|
assert withHyperscan -> stdenv.isx86_64;
|
||||||
|
@ -24,11 +25,12 @@ stdenv.mkDerivation rec {
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkgconfig perl ];
|
nativeBuildInputs = [ cmake pkgconfig perl ];
|
||||||
buildInputs = [ glib libevent libmagic luajit openssl pcre sqlite ragel icu jemalloc ]
|
buildInputs = [ glib libevent libmagic openssl pcre sqlite ragel icu jemalloc ]
|
||||||
++ lib.optional withFann libfann
|
++ lib.optional withFann libfann
|
||||||
++ lib.optional withGd gd
|
++ lib.optional withGd gd
|
||||||
++ lib.optional withHyperscan hyperscan
|
++ lib.optional withHyperscan hyperscan
|
||||||
++ lib.optional withBlas openblas;
|
++ lib.optional withBlas openblas
|
||||||
|
++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua;
|
||||||
|
|
||||||
cmakeFlags = [
|
cmakeFlags = [
|
||||||
"-DDEBIAN_BUILD=ON"
|
"-DDEBIAN_BUILD=ON"
|
||||||
|
@ -39,10 +41,11 @@ stdenv.mkDerivation rec {
|
||||||
"-DENABLE_JEMALLOC=ON"
|
"-DENABLE_JEMALLOC=ON"
|
||||||
] ++ lib.optional withFann "-DENABLE_FANN=ON"
|
] ++ lib.optional withFann "-DENABLE_FANN=ON"
|
||||||
++ lib.optional withHyperscan "-DENABLE_HYPERSCAN=ON"
|
++ lib.optional withHyperscan "-DENABLE_HYPERSCAN=ON"
|
||||||
++ lib.optional withGd "-DENABLE_GD=ON";
|
++ lib.optional withGd "-DENABLE_GD=ON"
|
||||||
|
++ lib.optional (!withLuaJIT) "-DENABLE_TORCH=OFF";
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
homepage = https://rspamd.com;
|
homepage = "https://rspamd.com";
|
||||||
license = licenses.asl20;
|
license = licenses.asl20;
|
||||||
description = "Advanced spam filtering system";
|
description = "Advanced spam filtering system";
|
||||||
maintainers = with maintainers; [ avnik fpletz globin ];
|
maintainers = with maintainers; [ avnik fpletz globin ];
|
||||||
|
|
Loading…
Reference in New Issue