* [Buildroot] [PATCH 1/1] wireshark: add libkrb5 optional dependency
@ 2018-11-03 14:08 Fabrice Fontaine
2018-11-03 14:57 ` Thomas Petazzoni
0 siblings, 1 reply; 2+ messages in thread
From: Fabrice Fontaine @ 2018-11-03 14:08 UTC (permalink / raw)
To: buildroot
Specify the path to found libkrb5 as this is done for other options
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
package/wireshark/wireshark.mk | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 421338f0f8..357ef10c9f 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -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
--
2.17.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH 1/1] wireshark: add libkrb5 optional dependency
2018-11-03 14:08 [Buildroot] [PATCH 1/1] wireshark: add libkrb5 optional dependency Fabrice Fontaine
@ 2018-11-03 14:57 ` Thomas Petazzoni
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Petazzoni @ 2018-11-03 14:57 UTC (permalink / raw)
To: buildroot
Hello,
On Sat, 3 Nov 2018 15:08:10 +0100, Fabrice Fontaine wrote:
> Specify the path to found libkrb5 as this is done for other options
>
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
> package/wireshark/wireshark.mk | 8 +++++++-
> 1 file changed, 7 insertions(+), 1 deletion(-)
Applied to master, thanks.
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-11-03 14:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-03 14:08 [Buildroot] [PATCH 1/1] wireshark: add libkrb5 optional dependency Fabrice Fontaine
2018-11-03 14:57 ` Thomas Petazzoni
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox