Gentoo Archives: gentoo-commits

From: Slawek Lis <slis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/suricata/
Date: Fri, 11 May 2018 07:43:35
Message-Id: 1526024607.2e6b7a4b972c110a62877daf862231eb99c08c1f.slis@gentoo
1 commit: 2e6b7a4b972c110a62877daf862231eb99c08c1f
2 Author: Slawomir Lis <slis <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 11 07:40:16 2018 +0000
4 Commit: Slawek Lis <slis <AT> gentoo <DOT> org>
5 CommitDate: Fri May 11 07:43:27 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e6b7a4b
7
8 net-analyzer/suricata: fixed problems with compilation
9
10 Fixed problems with compilation using lua and luajit
11
12 Package-Manager: Portage-2.3.36, Repoman-2.3.9
13
14 net-analyzer/suricata/suricata-4.0.3.ebuild | 19 +++++++++----------
15 1 file changed, 9 insertions(+), 10 deletions(-)
16
17 diff --git a/net-analyzer/suricata/suricata-4.0.3.ebuild b/net-analyzer/suricata/suricata-4.0.3.ebuild
18 index e501c9c775b..19c4e17ebb2 100644
19 --- a/net-analyzer/suricata/suricata-4.0.3.ebuild
20 +++ b/net-analyzer/suricata/suricata-4.0.3.ebuild
21 @@ -27,10 +27,8 @@ DEPEND="
22 sys-apps/file
23 cuda? ( dev-util/nvidia-cuda-toolkit )
24 geoip? ( dev-libs/geoip )
25 - lua? (
26 - !luajit? ( dev-lang/lua:* )
27 - luajit? ( dev-lang/luajit:* )
28 - )
29 + lua? ( dev-lang/lua:* )
30 + luajit? ( dev-lang/luajit:* )
31 nflog? ( net-libs/libnetfilter_log )
32 nfqueue? ( net-libs/libnetfilter_queue )
33 redis? ( dev-libs/hiredis )
34 @@ -83,15 +81,16 @@ src_configure() {
35 # myeconfargs+=( $(use_enable pfring) )
36 # fi
37 # no libprelude in portage
38 -# if use prelude ; then
39 +# if use prelude ; theng
40 # myeconfargs+=( $(use_enable prelude) )
41 # fi
42 if use lua ; then
43 - myeconfargs+=(
44 - $(use_enable !luajit lua)
45 - $(use_enable luajit)
46 - )
47 - else
48 + myeconfargs+=( $(use_enable lua) )
49 + fi
50 + if use luajit ; then
51 + myeconfargs+=( $(use_enable luajit) )
52 + fi
53 + if (use !lua) && (use !luajit) ; then
54 myeconfargs+=(
55 --disable-lua
56 --disable-luajit