All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package/wireshark: add minizip-zlib optional dependency
@ 2022-12-29 10:46 Fabrice Fontaine
  2023-01-06  7:37 ` Peter Korsgaard
  2023-01-11 19:42 ` Peter Korsgaard
  0 siblings, 2 replies; 3+ messages in thread
From: Fabrice Fontaine @ 2022-12-29 10:46 UTC (permalink / raw)
  To: buildroot; +Cc: Fabrice Fontaine

minizip-zlib is an optional dependency which is enabled by default since
version 3.1.0 and
https://github.com/wireshark/wireshark/commit/390071ed0bc8aaf378c3468989ccde1c93817542

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/wireshark/wireshark.mk | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 5da344fc55..801c6fff5a 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -115,6 +115,13 @@ else
 WIRESHARK_CONF_OPTS += -DENABLE_LZ4=OFF
 endif
 
+ifeq ($(BR2_PACKAGE_MINIZIP_ZLIB),y)
+WIRESHARK_CONF_OPTS += -DENABLE_MINIZIP=ON
+WIRESHARK_DEPENDENCIES += minizip-zlib
+else
+WIRESHARK_CONF_OPTS += -DENABLE_MINIZIP=OFF
+endif
+
 ifeq ($(BR2_PACKAGE_NGHTTP2),y)
 WIRESHARK_CONF_OPTS += -DENABLE_NGHTTP2=ON
 WIRESHARK_DEPENDENCIES += nghttp2
-- 
2.35.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/wireshark: add minizip-zlib optional dependency
  2022-12-29 10:46 [Buildroot] [PATCH 1/1] package/wireshark: add minizip-zlib optional dependency Fabrice Fontaine
@ 2023-01-06  7:37 ` Peter Korsgaard
  2023-01-11 19:42 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2023-01-06  7:37 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > minizip-zlib is an optional dependency which is enabled by default since
 > version 3.1.0 and
 > https://github.com/wireshark/wireshark/commit/390071ed0bc8aaf378c3468989ccde1c93817542

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [Buildroot] [PATCH 1/1] package/wireshark: add minizip-zlib optional dependency
  2022-12-29 10:46 [Buildroot] [PATCH 1/1] package/wireshark: add minizip-zlib optional dependency Fabrice Fontaine
  2023-01-06  7:37 ` Peter Korsgaard
@ 2023-01-11 19:42 ` Peter Korsgaard
  1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2023-01-11 19:42 UTC (permalink / raw)
  To: Fabrice Fontaine; +Cc: buildroot

>>>>> "Fabrice" == Fabrice Fontaine <fontaine.fabrice@gmail.com> writes:

 > minizip-zlib is an optional dependency which is enabled by default since
 > version 3.1.0 and
 > https://github.com/wireshark/wireshark/commit/390071ed0bc8aaf378c3468989ccde1c93817542

 > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Committed to 2022.11.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-01-11 19:42 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-29 10:46 [Buildroot] [PATCH 1/1] package/wireshark: add minizip-zlib optional dependency Fabrice Fontaine
2023-01-06  7:37 ` Peter Korsgaard
2023-01-11 19:42 ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.