aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVsevolod Stakhov <vsevolod@highsecure.ru>2018-06-29 10:17:11 +0100
committerVsevolod Stakhov <vsevolod@highsecure.ru>2018-06-29 10:17:11 +0100
commit53632b619666d67d14640b1dc0832b2ab6eb8aa8 (patch)
tree4345f9054320a55298e6edf1d6f488e3bbee243f
parent748659036ec90f9613315825ce4597031fbce5c6 (diff)
downloadrspamd-53632b619666d67d14640b1dc0832b2ab6eb8aa8.tar.gz
rspamd-53632b619666d67d14640b1dc0832b2ab6eb8aa8.zip
[Minor] Enable libunwind in packages
-rw-r--r--centos/rspamd.spec10
-rw-r--r--debian/control2
-rwxr-xr-xdebian/rules1
3 files changed, 7 insertions, 6 deletions
diff --git a/centos/rspamd.spec b/centos/rspamd.spec
index b16e070de..d2b493085 100644
--- a/centos/rspamd.spec
+++ b/centos/rspamd.spec
@@ -16,7 +16,7 @@ License: ASL 2.0
URL: https://rspamd.com
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}
BuildRequires: glib2-devel,libevent-devel,openssl-devel,pcre-devel
-BuildRequires: cmake,gmime-devel,file-devel,ragel
+BuildRequires: cmake,gmime-devel,file-devel,ragel,libunwind-devel
%if 0%{?el6}
BuildRequires: perl
%else
@@ -81,11 +81,10 @@ lua.
-DCMAKE_SKIP_INSTALL_RPATH=ON \
%endif
%if 0%{?fedora_version} >= 22 || 0%{?suse_version} >= 1320
- -DENABLE_LUAJIT=ON \
+ -DENABLE_LUAJIT=ON \
%else
- -DENABLE_LUAJIT=OFF \
+ -DENABLE_LUAJIT=OFF \
%endif
- -DENABLE_HIREDIS=ON \
-DLOGDIR=%{_localstatedir}/log/rspamd \
-DEXAMPLESDIR=%{_datadir}/examples/rspamd \
-DPLUGINSDIR=%{_datadir}/rspamd \
@@ -94,7 +93,8 @@ lua.
-DNO_SHARED=ON \
-DDEBIAN_BUILD=1 \
-DRSPAMD_GROUP=%{rspamd_group} \
- -DRSPAMD_USER=%{rspamd_user}
+ -DRSPAMD_USER=%{rspamd_user} \
+ -DENABLE_LIBUNWIND=ON
%{__make} %{?jobs:-j%jobs}
diff --git a/debian/control b/debian/control
index 5b9693723..66303d91b 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: rspamd
Section: mail
Priority: extra
Maintainer: Mikhail Gusarov <dottedmag@debian.org>
-Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), cmake, libevent-dev (>= 1.3), libglib2.0-dev (>= 2.16.0), libluajit-5.1-dev [amd64 armel armhf i386 kfreebsd-i386 mips mipsel powerpc powerpcspe] | liblua5.1-dev, libpcre3-dev, libssl-dev (>= 1.0), libcurl4-openssl-dev, libsqlite3-dev, libmagic-dev, perl, dh-systemd, libjemalloc-dev, ragel, libicu-dev, zlib1g-dev
+Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), cmake, libevent-dev (>= 1.3), libglib2.0-dev (>= 2.16.0), libluajit-5.1-dev [amd64 armel armhf i386 kfreebsd-i386 mips mipsel powerpc powerpcspe] | liblua5.1-dev, libpcre3-dev, libssl-dev (>= 1.0), libcurl4-openssl-dev, libsqlite3-dev, libmagic-dev, perl, dh-systemd, libjemalloc-dev, ragel, libicu-dev, zlib1g-dev, libunwind-dev
Standards-Version: 3.9.6
Homepage: https://rspamd.com
Vcs-Git: git://github.com/vstakhov/rspamd.git
diff --git a/debian/rules b/debian/rules
index c958a26ea..a51894f38 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,6 +30,7 @@ override_dh_auto_configure:
-DENABLE_HIREDIS=ON \
-DENABLE_LUAJIT=ON \
-DENABLE_TORCH=ON \
+ -DENABLE_LIBUNWIND=ON \
-DWANT_SYSTEMD_UNITS=ON
override_dh_makeshlibs: