* [Buildroot] [PATCH 1/1] package/wireshark: add zlib optional dependency
@ 2022-12-29 10:39 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:39 UTC (permalink / raw)
To: buildroot; +Cc: Fabrice Fontaine
zlib is an optional dependency which is enabled by default since at
least version 1.8.0 and
https://github.com/wireshark/wireshark/commit/7133f6944dc26740f5ebf56c2ca33be86a6e0f09
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 48ae834d27..4451394957 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -164,6 +164,13 @@ else
WIRESHARK_CONF_OPTS += -DBUILD_sdjournal=OFF
endif
+ifeq ($(BR2_PACKAGE_ZLIB),y)
+WIRESHARK_CONF_OPTS += -DENABLE_ZLIB=ON
+WIRESHARK_DEPENDENCIES += zlib
+else
+WIRESHARK_CONF_OPTS += -DENABLE_ZLIB=OFF
+endif
+
ifeq ($(BR2_PACKAGE_ZSTD),y)
WIRESHARK_CONF_OPTS += -DENABLE_ZSTD=ON
WIRESHARK_DEPENDENCIES += zstd
--
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 zlib optional dependency
2022-12-29 10:39 [Buildroot] [PATCH 1/1] package/wireshark: add 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:
> zlib is an optional dependency which is enabled by default since at
> least version 1.8.0 and
> https://github.com/wireshark/wireshark/commit/7133f6944dc26740f5ebf56c2ca33be86a6e0f09
> 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 zlib optional dependency
2022-12-29 10:39 [Buildroot] [PATCH 1/1] package/wireshark: add 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:
> zlib is an optional dependency which is enabled by default since at
> least version 1.8.0 and
> https://github.com/wireshark/wireshark/commit/7133f6944dc26740f5ebf56c2ca33be86a6e0f09
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Committed to 2022.11.x and 2022.02.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:39 [Buildroot] [PATCH 1/1] package/wireshark: add 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.