From patchwork Wed Oct 31 22:56:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 991739 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="eTmviObQ"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42lkHR35xcz9sBQ for ; Thu, 1 Nov 2018 09:57:07 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4B8992280A; Wed, 31 Oct 2018 22:57:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zGdaN7ZzPpe3; Wed, 31 Oct 2018 22:57:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 4797D226E9; Wed, 31 Oct 2018 22:57:01 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 263371BF5A8 for ; Wed, 31 Oct 2018 22:57:00 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 232B08639B for ; Wed, 31 Oct 2018 22:57:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 64eH14hlyxTv for ; Wed, 31 Oct 2018 22:56:59 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by hemlock.osuosl.org (Postfix) with ESMTPS id 5B4018638E for ; Wed, 31 Oct 2018 22:56:59 +0000 (UTC) Received: by mail-wm1-f67.google.com with SMTP id a8-v6so15917335wmf.1 for ; Wed, 31 Oct 2018 15:56:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=nJZAACvto2EbrBtNZRhNv58L73o599TTlH28zzfeNMw=; b=eTmviObQY0LaIqbvK75W/cEs7Y7WwhHyoN2xtqcskLqYFsoho3SkWa2P2PlCg7/1aO iK1gWoUr8pFvAD6xlL1tq77H8kudn+rht0nOi2cG0bjcmHHXHaAz78VPzg5hcTCdPZ43 UH1/AoVURveWUyEgPwszV6gU7a0hfph5/seQxtZJjCbVwi1uWBFpq50lN5KvdksU8McG DwqKdsJ59J2SghIEAfZVIaFq/R61DF8vPck4feiHKwtsOUenHDWjPFILy6AUDBJrpJ6x xPV6D+OhmEwL/0Gy8kvJF8mUAE2pupX9cnFd0Did91XVpvyg48QB3f0ijVL/4/t5brS7 74NA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=nJZAACvto2EbrBtNZRhNv58L73o599TTlH28zzfeNMw=; b=jWq0EauSY7vL+VWtd5o8BV5z1/YcLLTP5HQiHb0MmJk9DJETcyJB5a84ZtM33xnmfH buHZf+ya5TVAW7BoovqSeZDkEY40D+C0YItewyrhaJkUF6FTQY9NSoAIAlJrctYEuTA+ d1EZu2GTftCyHH457FGvsFc2FEkvSam03GVYW391/r8XYsDcgAFGuTI2LGF0X0mm3COO VHvZ83tKx4A761+B8oaGki2Q2ga42kEfyxIU1pRMdMYD2bkgK8NMtnLbQL98XmeSnXOw W7NBGeR3azVsAbgjtheEYpknnP2oGS3DlbhCU37iEbCHmRe/lI7k+j2Ice4Kxe010uzg mGvQ== X-Gm-Message-State: AGRZ1gJtTYFUQGf4X/EakjGuWgO4azMlZt3EfVLxFhFXUS1akfKSD4Cd UVTgI9hN8tsJl7R3eCwFkZnxJWfw X-Google-Smtp-Source: AJdET5dH8w7yurgILZPRf1bP7z6lZ7B7RD0xFRDT6H9vfZF41fIzU3hhbSq3PQc+Nzllk2nKHJhwnQ== X-Received: by 2002:a1c:2dc7:: with SMTP id t190-v6mr3783797wmt.31.1541026617486; Wed, 31 Oct 2018 15:56:57 -0700 (PDT) Received: from localhost.localdomain (arennes-656-1-360-24.w2-11.abo.wanadoo.fr. [2.11.112.24]) by smtp.gmail.com with ESMTPSA id x8-v6sm70603543wrd.54.2018.10.31.15.56.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Oct 2018 15:56:56 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Wed, 31 Oct 2018 23:56:46 +0100 Message-Id: <20181031225647.23660-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH 1/2] wireshark: add libssh optional dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Optional dependency to libssh has been added with version 2.2.1 and https://github.com/wireshark/wireshark/commit/d6da95231ee790fd884ca2a41fe59aa9b05ccde9 - Specify the path to found libssh as this is done for other options Signed-off-by: Fabrice Fontaine --- package/wireshark/wireshark.mk | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index fb90f2b940..4569a86cb1 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -92,6 +92,13 @@ else WIRESHARK_CONF_OPTS += --without-libnl endif +ifeq ($(BR2_PACKAGE_LIBSSH),y) +WIRESHARK_CONF_OPTS += --with-libssh=$(STAGING_DIR)/usr +WIRESHARK_DEPENDENCIES += libssh +else +WIRESHARK_CONF_OPTS += --without-libssh +endif + ifeq ($(BR2_PACKAGE_SBC),y) WIRESHARK_CONF_OPTS += --with-sbc=yes WIRESHARK_DEPENDENCIES += sbc From patchwork Wed Oct 31 22:56:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 991740 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Y2Yx3bDM"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42lkHS0G5mz9sDG for ; Thu, 1 Nov 2018 09:57:07 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 6BE8884237; Wed, 31 Oct 2018 22:57:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zPNMrK0-b7NJ; Wed, 31 Oct 2018 22:57:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 154CD842F6; Wed, 31 Oct 2018 22:57:05 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 919341BF5A8 for ; Wed, 31 Oct 2018 22:57:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8EA5D84DFF for ; Wed, 31 Oct 2018 22:57:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MTERcmzibM8Q for ; Wed, 31 Oct 2018 22:57:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by fraxinus.osuosl.org (Postfix) with ESMTPS id D75C984DB7 for ; Wed, 31 Oct 2018 22:57:02 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id b203-v6so16006631wme.5 for ; Wed, 31 Oct 2018 15:57:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=riQkGkUm3s9FguHKitfUkRNudHAQvZZsYy6XUN04J2M=; b=Y2Yx3bDMYJsUczTXp31c2jMBxnoyy7wvcJzHUY+No7t45osk0sX05Yp4wUoWayZ/C8 kk8cnO7tRjzn1ZrNZyZegEjkc3zR0dEd99fUg5jvMLVRTcB4rNBrxgZP28CQWGcULHBM bm1UdA09UcovLWAhTtj28E2kHtBVUVoXUBJJtXNHF/J7UnLXMSVGKsC/LZ68sroi0Gik EkOuP86O8H4EjXsVvSJfbRzf+ncNWSneIgNA+kIv+6utM5crmV2aWQ2waES0ljZEGDWn Vx2uPT5fC8dDW81bmV3UJo/fK4djhYZFCJQgbTyik7/l9+Gxn78rNJ2N9fvXNchjZM6/ OQAQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=riQkGkUm3s9FguHKitfUkRNudHAQvZZsYy6XUN04J2M=; b=sPON7C9Cgga3w6HhqaAbvskM8DP05Y+3JvkZS78nATI4B35KzdhDurnpMOQu8K1h2h lvbfKnw8pni+VE1g9ZciUZkAxgP9r/WUKUflC0RpZSRrNeCVjgP9iiJEAz85TL303MyV XYHOe2EEJYckM1hQDXkdAONn2Cy5eOwom8L8i4RgUH4kQNzInF6rAfpqwkGT99kybCO7 qL/AKUjwOvNtLmdXeQwel7QqME7nTW8zN8zs/+pZMvBQkb8Y6Btr2iQRxRL5kITN8IAN eCfXzYyuGZAwjUSAscv5d+sCFp0Bd/IoPSv/cbmC76Vfll6oYntuDWp/Eqd+eC/DAYm6 BY3w== X-Gm-Message-State: AGRZ1gKcHUNwFYI4Af22N8/sUquwoNiQGoJmvRy1WBd8cFSOX0+OMi2q PG5LgA+q5k+XRdF8bKOV2cEtydNa X-Google-Smtp-Source: AJdET5d7NthlcQn4ifkWLiNPhiMXR7fJcTqO2CNB4onJ2yB2myxmr+u6ql+A+ffM/9C6sjWscKijHg== X-Received: by 2002:a1c:6c09:: with SMTP id h9-v6mr3748197wmc.131.1541026621061; Wed, 31 Oct 2018 15:57:01 -0700 (PDT) Received: from localhost.localdomain (arennes-656-1-360-24.w2-11.abo.wanadoo.fr. [2.11.112.24]) by smtp.gmail.com with ESMTPSA id x8-v6sm70603543wrd.54.2018.10.31.15.57.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Oct 2018 15:57:00 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Wed, 31 Oct 2018 23:56:47 +0100 Message-Id: <20181031225647.23660-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181031225647.23660-1-fontaine.fabrice@gmail.com> References: <20181031225647.23660-1-fontaine.fabrice@gmail.com> Subject: [Buildroot] [PATCH 2/2] wireshark: add lua optional dependency X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - lua 5.3 or luajit is not supported - Don't specify the path to found lua as pkgconfig is used for lua (this is not the case for the other options) Signed-off-by: Fabrice Fontaine --- package/wireshark/wireshark.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk index 4569a86cb1..421338f0f8 100644 --- a/package/wireshark/wireshark.mk +++ b/package/wireshark/wireshark.mk @@ -22,7 +22,6 @@ WIRESHARK_CONF_OPTS = \ --without-krb5 \ --enable-static=no \ --with-libsmi=no \ - --with-lua=no \ --with-pcap=$(STAGING_DIR)/usr \ --includedir=$(STAGING_DIR)/usr/include @@ -99,6 +98,14 @@ else WIRESHARK_CONF_OPTS += --without-libssh endif +# no support for lua53 yet +ifeq ($(BR2_PACKAGE_LUA_5_1)$(BR2_PACKAGE_LUA_5_2),y) +WIRESHARK_CONF_OPTS += --with-lua +WIRESHARK_DEPENDENCIES += lua +else +WIRESHARK_CONF_OPTS += --without-lua +endif + ifeq ($(BR2_PACKAGE_SBC),y) WIRESHARK_CONF_OPTS += --with-sbc=yes WIRESHARK_DEPENDENCIES += sbc