1 |
Fix the package to use standard meaning for USE=luajit instead of making |
2 |
it exclusive with USE=lua. |
3 |
--- |
4 |
net-analyzer/suricata/metadata.xml | 1 - |
5 |
net-analyzer/suricata/suricata-4.0.3.ebuild | 21 +++++++++++++-------- |
6 |
2 files changed, 13 insertions(+), 9 deletions(-) |
7 |
|
8 |
diff --git a/net-analyzer/suricata/metadata.xml b/net-analyzer/suricata/metadata.xml |
9 |
index 58878c64f05c..0afee5625d1a 100644 |
10 |
--- a/net-analyzer/suricata/metadata.xml |
11 |
+++ b/net-analyzer/suricata/metadata.xml |
12 |
@@ -9,7 +9,6 @@ |
13 |
<flag name="control-socket">Enable unix socket</flag> |
14 |
<flag name="cuda">Enable NVIDIA Cuda computations support</flag> |
15 |
<flag name="detection">Enable detection modules</flag> |
16 |
- <flag name="luajit">Enable Luajit support</flag> |
17 |
<flag name="nflog">Enable libnetfilter_log support</flag> |
18 |
<flag name="nfqueue">Enable NFQUEUE support for inline IDP</flag> |
19 |
<flag name="redis">Enable Redis support</flag> |
20 |
diff --git a/net-analyzer/suricata/suricata-4.0.3.ebuild b/net-analyzer/suricata/suricata-4.0.3.ebuild |
21 |
index 604eae665be7..e501c9c775b2 100644 |
22 |
--- a/net-analyzer/suricata/suricata-4.0.3.ebuild |
23 |
+++ b/net-analyzer/suricata/suricata-4.0.3.ebuild |
24 |
@@ -14,8 +14,6 @@ SLOT="0" |
25 |
KEYWORDS="~amd64 ~x86" |
26 |
IUSE="+af-packet control-socket cuda debug +detection geoip hardened logrotate lua luajit nflog +nfqueue redis +rules test" |
27 |
|
28 |
-REQUIRED_USE="lua? ( !luajit )" |
29 |
- |
30 |
DEPEND=" |
31 |
>=dev-libs/jansson-2.2 |
32 |
dev-libs/libpcre |
33 |
@@ -29,8 +27,10 @@ DEPEND=" |
34 |
sys-apps/file |
35 |
cuda? ( dev-util/nvidia-cuda-toolkit ) |
36 |
geoip? ( dev-libs/geoip ) |
37 |
- lua? ( dev-lang/lua:* ) |
38 |
- luajit? ( dev-lang/luajit:* ) |
39 |
+ lua? ( |
40 |
+ !luajit? ( dev-lang/lua:* ) |
41 |
+ luajit? ( dev-lang/luajit:* ) |
42 |
+ ) |
43 |
nflog? ( net-libs/libnetfilter_log ) |
44 |
nfqueue? ( net-libs/libnetfilter_queue ) |
45 |
redis? ( dev-libs/hiredis ) |
46 |
@@ -87,10 +87,15 @@ src_configure() { |
47 |
# myeconfargs+=( $(use_enable prelude) ) |
48 |
# fi |
49 |
if use lua ; then |
50 |
- myeconfargs+=( $(use_enable lua) ) |
51 |
- fi |
52 |
- if use luajit ; then |
53 |
- myeconfargs+=( $(use_enable luajit) ) |
54 |
+ myeconfargs+=( |
55 |
+ $(use_enable !luajit lua) |
56 |
+ $(use_enable luajit) |
57 |
+ ) |
58 |
+ else |
59 |
+ myeconfargs+=( |
60 |
+ --disable-lua |
61 |
+ --disable-luajit |
62 |
+ ) |
63 |
fi |
64 |
|
65 |
# this should be used when pf_ring use flag support will be added |
66 |
-- |
67 |
2.16.2 |