Skip to contentSkip to conversation

wireshark: add libssh optional dependency

PATCH New Fabrice Fontaine 2 participants 3 messages Oct 31, 2018 – Nov 2, 2018

lore
Share & tools
lore

Fabrice Fontaine

author
#0 lore raw

PATCH 1/2 wireshark: add libssh optional dependency

- 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 <[email protected]>
---
 package/wireshark/wireshark.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/wireshark/wireshark.mk +7 -0
index fb90f2b940..4569a86cb1 100644
@@ -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
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 2/2 wireshark: add lua optional dependency

- 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 <[email protected]>
---
 package/wireshark/wireshark.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
package/wireshark/wireshark.mk +8 -1
index 4569a86cb1..421338f0f8 100644
@@ -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
Signature · 1 line
2.17.1
#2 lore raw

PATCH 1/2 wireshark: add libssh optional dependency

In reply to Fabrice Fontaine

Hello,

Quoted 8 lines · Fabrice Fontaine

- 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 <[email protected]>
---
 package/wireshark/wireshark.mk | 7 +++++++
 1 file changed, 7 insertions(+)

Both applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com