From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 402C61382C5 for ; Fri, 11 May 2018 07:43:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DBC1E096F; Fri, 11 May 2018 07:43:34 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 75536E096F for ; Fri, 11 May 2018 07:43:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 420EE335C36 for ; Fri, 11 May 2018 07:43:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E5BCE29 for ; Fri, 11 May 2018 07:43:31 +0000 (UTC) From: "Slawek Lis" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Slawek Lis" Message-ID: <1526024607.2e6b7a4b972c110a62877daf862231eb99c08c1f.slis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-analyzer/suricata/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-analyzer/suricata/suricata-4.0.3.ebuild X-VCS-Directories: net-analyzer/suricata/ X-VCS-Committer: slis X-VCS-Committer-Name: Slawek Lis X-VCS-Revision: 2e6b7a4b972c110a62877daf862231eb99c08c1f X-VCS-Branch: master Date: Fri, 11 May 2018 07:43:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 70b4762f-d695-430a-a9eb-939e957c39bb X-Archives-Hash: 3aef87ef41da68d17a3d0e2b939665ee commit: 2e6b7a4b972c110a62877daf862231eb99c08c1f Author: Slawomir Lis gentoo org> AuthorDate: Fri May 11 07:40:16 2018 +0000 Commit: Slawek Lis gentoo org> CommitDate: Fri May 11 07:43:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e6b7a4b net-analyzer/suricata: fixed problems with compilation Fixed problems with compilation using lua and luajit Package-Manager: Portage-2.3.36, Repoman-2.3.9 net-analyzer/suricata/suricata-4.0.3.ebuild | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/net-analyzer/suricata/suricata-4.0.3.ebuild b/net-analyzer/suricata/suricata-4.0.3.ebuild index e501c9c775b..19c4e17ebb2 100644 --- a/net-analyzer/suricata/suricata-4.0.3.ebuild +++ b/net-analyzer/suricata/suricata-4.0.3.ebuild @@ -27,10 +27,8 @@ DEPEND=" sys-apps/file cuda? ( dev-util/nvidia-cuda-toolkit ) geoip? ( dev-libs/geoip ) - lua? ( - !luajit? ( dev-lang/lua:* ) - luajit? ( dev-lang/luajit:* ) - ) + lua? ( dev-lang/lua:* ) + luajit? ( dev-lang/luajit:* ) nflog? ( net-libs/libnetfilter_log ) nfqueue? ( net-libs/libnetfilter_queue ) redis? ( dev-libs/hiredis ) @@ -83,15 +81,16 @@ src_configure() { # myeconfargs+=( $(use_enable pfring) ) # fi # no libprelude in portage -# if use prelude ; then +# if use prelude ; theng # myeconfargs+=( $(use_enable prelude) ) # fi if use lua ; then - myeconfargs+=( - $(use_enable !luajit lua) - $(use_enable luajit) - ) - else + myeconfargs+=( $(use_enable lua) ) + fi + if use luajit ; then + myeconfargs+=( $(use_enable luajit) ) + fi + if (use !lua) && (use !luajit) ; then myeconfargs+=( --disable-lua --disable-luajit