hyperscan: Build only on x86

This package does not compile on ARM

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/hyperscan/hyperscan.nm b/hyperscan/hyperscan.nm
index c781f73bd71a84e75f9558a1ed45cbf3af06302e..e1688a5c3d8fa6da0a5623537e84a3a6e9b9f8c5 100644 (file)
--- a/hyperscan/hyperscan.nm
+++ b/hyperscan/hyperscan.nm
@@ -5,7 +5,10 @@
 
 name       = hyperscan
 version    = 5.1.0
-release    = 1
+release    = 2
+
+# This won't build on any architectures but those
+sup_arches = x86_64 i686
 
 groups     = System/Libraries
 url        = https://github.com/intel/hyperscan

diff --git a/suricata/suricata.nm b/suricata/suricata.nm
index 2a560ec2e6975a0845544f6a246245a184903e21..4825612e247e1ea90449abaf83bcb3f4b97900f5 100644 (file)
--- a/suricata/suricata.nm
+++ b/suricata/suricata.nm
@@ -5,7 +5,7 @@
 
 name       = suricata
 version    = 4.0.6
-release    = 2
+release    = 3
 
 groups     = Networking/IDS
 url        = http://www.openinfosecfoundation.org/
@@ -23,7 +23,6 @@ source_dl  = http://www.openinfosecfoundation.org/download/
 build
        requires
                file-devel
-               hyperscan-devel
                libcap-ng-devel
                libnfnetlink-devel
                libnetfilter_queue-devel
@@ -41,11 +40,16 @@ build
                --enable-nfqueue \
                --disable-gccmarch-native \
                --disable-static \
-               --enable-hyperscan \
                --enable-non-bundled-htp \
                --with-libhtp-includes=%{includedir}/htp \
                --with-libhtp-libraries=%{libdir}
 
+       # Enable hyperscan only on x86
+       if "%{DISTRO_PLATFORM}" == "x86"
+               requires += hyperscan-devel
+               configure_options += --enable-hyperscan
+       end
+
        install_cmds
                mkdir -pv %{BUILDROOT}%{sysconfdir}
                mkdir -pv %{BUILDROOT}%{sysconfdir}/suricata