Skip to contentSkip to conversation

wireshark: add libkrb5 optional dependency

PATCH New Fabrice Fontaine 2 participants 2 messages Nov 3, 2018

lore
Share & tools
lore

Fabrice Fontaine

author
#0 lore raw

PATCH 1/1 wireshark: add libkrb5 optional dependency

Specify the path to found libkrb5 as this is done for other options

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/wireshark/wireshark.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
package/wireshark/wireshark.mk +7 -1
index 421338f0f8..357ef10c9f 100644
@@ -19,7 +19,6 @@ WIRESHARK_AUTORECONF = YES
 # wireshark adds -I$includedir to CFLAGS, causing host/target headers mixup.
 # Work around it by pointing includedir at staging
 WIRESHARK_CONF_OPTS = \
-	--without-krb5 \
 	--enable-static=no \
 	--with-libsmi=no \
 	--with-pcap=$(STAGING_DIR)/usr \

@@ -84,6 +83,13 @@ else
 WIRESHARK_CONF_OPTS += --with-gcrypt=no
 endif
 
+ifeq ($(BR2_PACKAGE_LIBKRB5),y)
+WIRESHARK_CONF_OPTS += --with-krb5=$(STAGING_DIR)/usr
+WIRESHARK_DEPENDENCIES += libkrb5
+else
+WIRESHARK_CONF_OPTS += --without-krb5
+endif
+
 ifeq ($(BR2_PACKAGE_LIBNL),y)
 WIRESHARK_CONF_OPTS += --with-libnl
 WIRESHARK_DEPENDENCIES += libnl
Signature · 1 line
2.17.1
Applied
#1 lore raw

PATCH 1/1 wireshark: add libkrb5 optional dependency

Hello,

Quoted 6 lines · Fabrice Fontaine

Specify the path to found libkrb5 as this is done for other options

Signed-off-by Fabrice Fontaine <[email protected]>
---
 package/wireshark/wireshark.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Applied to master, thanks.

Thomas

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