* [Buildroot] [PATCH 2/9] wireshark: needs host-pkgconf
2015-12-02 20:48 [Buildroot] [PATCH 1/9] wireshark: forcibly disable lua Gustavo Zacarias
@ 2015-12-02 20:48 ` Gustavo Zacarias
2015-12-02 20:58 ` Yann E. MORIN
2015-12-02 20:48 ` [Buildroot] [PATCH 3/9] wireshark: enable GUI options Gustavo Zacarias
` (8 subsequent siblings)
9 siblings, 1 reply; 25+ messages in thread
From: Gustavo Zacarias @ 2015-12-02 20:48 UTC (permalink / raw)
To: buildroot
Needed for detection of various optional components.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/wireshark/wireshark.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 867b945..5d1d5f6 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -9,7 +9,7 @@ WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions
WIRESHARK_LICENSE = wireshark license
WIRESHARK_LICENSE_FILES = COPYING
-WIRESHARK_DEPENDENCIES = libpcap libgcrypt libglib2
+WIRESHARK_DEPENDENCIES = host-pkgconf libpcap libgcrypt libglib2
WIRESHARK_CONF_ENV = \
LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
ac_cv_path_PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
--
2.4.10
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 2/9] wireshark: needs host-pkgconf
2015-12-02 20:48 ` [Buildroot] [PATCH 2/9] wireshark: needs host-pkgconf Gustavo Zacarias
@ 2015-12-02 20:58 ` Yann E. MORIN
0 siblings, 0 replies; 25+ messages in thread
From: Yann E. MORIN @ 2015-12-02 20:58 UTC (permalink / raw)
To: buildroot
On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:
> Needed for detection of various optional components.
The real reason is that configure does use PKG_CHECK_MODULES, whether
optional or not.
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/wireshark/wireshark.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
> index 867b945..5d1d5f6 100644
> --- a/package/wireshark/wireshark.mk
> +++ b/package/wireshark/wireshark.mk
> @@ -9,7 +9,7 @@ WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
> WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions
> WIRESHARK_LICENSE = wireshark license
> WIRESHARK_LICENSE_FILES = COPYING
> -WIRESHARK_DEPENDENCIES = libpcap libgcrypt libglib2
> +WIRESHARK_DEPENDENCIES = host-pkgconf libpcap libgcrypt libglib2
> WIRESHARK_CONF_ENV = \
> LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
> ac_cv_path_PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
> --
> 2.4.10
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 3/9] wireshark: enable GUI options
2015-12-02 20:48 [Buildroot] [PATCH 1/9] wireshark: forcibly disable lua Gustavo Zacarias
2015-12-02 20:48 ` [Buildroot] [PATCH 2/9] wireshark: needs host-pkgconf Gustavo Zacarias
@ 2015-12-02 20:48 ` Gustavo Zacarias
2015-12-02 21:55 ` Yann E. MORIN
2015-12-02 20:48 ` [Buildroot] [PATCH 4/9] wireshark: add optional libnl suport Gustavo Zacarias
` (7 subsequent siblings)
9 siblings, 1 reply; 25+ messages in thread
From: Gustavo Zacarias @ 2015-12-02 20:48 UTC (permalink / raw)
To: buildroot
Enable gtk2, gtk3 & qt5 automatic GUI options.
gtk2 & qt5 only build-time tested, gtk3 runtime-tested with wayland.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/wireshark/wireshark.mk | 30 +++++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 5d1d5f6..9a8d370 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -20,7 +20,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 = \
- --disable-wireshark \
--without-krb5 \
--disable-usr-local \
--enable-static=no \
@@ -29,4 +28,33 @@ WIRESHARK_CONF_OPTS = \
--with-lua=no \
--includedir=$(STAGING_DIR)/usr/include
+# wireshark GUI options
+ifeq ($(BR2_PACKAGE_LIBGTK3),y)
+WIRESHARK_CONF_OPTS += --with-gtk3=yes
+WIRESHARK_DEPENDENCIES += libgtk3
+else ifeq ($(BR2_PACKAGE_LIBGTK2),y)
+WIRESHARK_CONF_OPTS += --with-gtk2=yes
+WIRESHARK_DEPENDECIES += libgtk2
+else
+WIRESHARK_CONF_OPTS += --with-gtk3=no --with-gtk2=no
+endif
+
+# Qt4 needs accessibility, we don't support it
+ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
+WIRESHARK_CONF_OPTS += --with-qt=5
+WIRESHARK_DEPENDENCIES += qt5base
+# Seems it expects wrappers and passes a -qt=X parameter for version
+WIRESHARK_MAKE_OPTS += \
+ MOC="$(HOST_DIR)/usr/bin/moc" \
+ RCC="$(HOST_DIR)/usr/bin/rcc" \
+ UIC="$(HOST_DIR)/usr/bin/uic"
+else
+WIRESHARK_CONF_OPTS += --with-qt=no
+endif
+
+# No GUI at all
+ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_QT5BASE_WIDGETS),)
+WIRESHARK_CONF_OPTS += --disable-wireshark
+endif
+
$(eval $(autotools-package))
--
2.4.10
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 3/9] wireshark: enable GUI options
2015-12-02 20:48 ` [Buildroot] [PATCH 3/9] wireshark: enable GUI options Gustavo Zacarias
@ 2015-12-02 21:55 ` Yann E. MORIN
2015-12-02 22:21 ` Gustavo Zacarias
0 siblings, 1 reply; 25+ messages in thread
From: Yann E. MORIN @ 2015-12-02 21:55 UTC (permalink / raw)
To: buildroot
Gustavo, All,
On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:
> Enable gtk2, gtk3 & qt5 automatic GUI options.
> gtk2 & qt5 only build-time tested, gtk3 runtime-tested with wayland.
>
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
> package/wireshark/wireshark.mk | 30 +++++++++++++++++++++++++++++-
> 1 file changed, 29 insertions(+), 1 deletion(-)
>
> diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
> index 5d1d5f6..9a8d370 100644
> --- a/package/wireshark/wireshark.mk
> +++ b/package/wireshark/wireshark.mk
> @@ -20,7 +20,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 = \
> - --disable-wireshark \
> --without-krb5 \
> --disable-usr-local \
> --enable-static=no \
> @@ -29,4 +28,33 @@ WIRESHARK_CONF_OPTS = \
> --with-lua=no \
> --includedir=$(STAGING_DIR)/usr/include
>
> +# wireshark GUI options
> +ifeq ($(BR2_PACKAGE_LIBGTK3),y)
> +WIRESHARK_CONF_OPTS += --with-gtk3=yes
> +WIRESHARK_DEPENDENCIES += libgtk3
> +else ifeq ($(BR2_PACKAGE_LIBGTK2),y)
> +WIRESHARK_CONF_OPTS += --with-gtk2=yes
> +WIRESHARK_DEPENDECIES += libgtk2
> +else
> +WIRESHARK_CONF_OPTS += --with-gtk3=no --with-gtk2=no
And add this variable, too:
WIRESHARK_HAS_GUI = NO
> +endif
> +
> +# Qt4 needs accessibility, we don't support it
> +ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
> +WIRESHARK_CONF_OPTS += --with-qt=5
> +WIRESHARK_DEPENDENCIES += qt5base
> +# Seems it expects wrappers and passes a -qt=X parameter for version
> +WIRESHARK_MAKE_OPTS += \
> + MOC="$(HOST_DIR)/usr/bin/moc" \
> + RCC="$(HOST_DIR)/usr/bin/rcc" \
> + UIC="$(HOST_DIR)/usr/bin/uic"
> +else
> +WIRESHARK_CONF_OPTS += --with-qt=no
Ditto.
> +endif
> +
> +# No GUI at all
> +ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_QT5BASE_WIDGETS),)
And then change that condition to:
ifeq ($(WIRESHARK_HAS_GUI),NO)
which is simpler to manage should there be other toolkit we can use in
the future.
Regards,
Yann E. MORIN.
> +WIRESHARK_CONF_OPTS += --disable-wireshark
> +endif
> +
> $(eval $(autotools-package))
> --
> 2.4.10
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 3/9] wireshark: enable GUI options
2015-12-02 21:55 ` Yann E. MORIN
@ 2015-12-02 22:21 ` Gustavo Zacarias
0 siblings, 0 replies; 25+ messages in thread
From: Gustavo Zacarias @ 2015-12-02 22:21 UTC (permalink / raw)
To: buildroot
On 02/12/15 18:55, Yann E. MORIN wrote:
> And add this variable, too:
>
> WIRESHARK_HAS_GUI = NO
...
>> +# Qt4 needs accessibility, we don't support it
>> +ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y)
>> +WIRESHARK_CONF_OPTS += --with-qt=5
>> +WIRESHARK_DEPENDENCIES += qt5base
>> +# Seems it expects wrappers and passes a -qt=X parameter for version
>> +WIRESHARK_MAKE_OPTS += \
>> + MOC="$(HOST_DIR)/usr/bin/moc" \
>> + RCC="$(HOST_DIR)/usr/bin/rcc" \
>> + UIC="$(HOST_DIR)/usr/bin/uic"
>> +else
>> +WIRESHARK_CONF_OPTS += --with-qt=no
>
> Ditto.
>
>> +endif
>> +
>> +# No GUI at all
>> +ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_QT5BASE_WIDGETS),)
>
> And then change that condition to:
>
> ifeq ($(WIRESHARK_HAS_GUI),NO)
>
> which is simpler to manage should there be other toolkit we can use in
> the future.
Hi.
Well, only one gtk and/or qt variant can be built at the same time, and
i don't expect any other major toolkit to show up in the near future.
I think it can be adjusted in the future if that's the case, but right
now that's only cosmetic.
If someone fails to specify --disable-wireshark the wireshark
buildsystem will balk anyway since it's default on and won't detect any
usable toolkit.
Regards.
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 4/9] wireshark: add optional libnl suport
2015-12-02 20:48 [Buildroot] [PATCH 1/9] wireshark: forcibly disable lua Gustavo Zacarias
2015-12-02 20:48 ` [Buildroot] [PATCH 2/9] wireshark: needs host-pkgconf Gustavo Zacarias
2015-12-02 20:48 ` [Buildroot] [PATCH 3/9] wireshark: enable GUI options Gustavo Zacarias
@ 2015-12-02 20:48 ` Gustavo Zacarias
2015-12-02 21:02 ` Yann E. MORIN
2015-12-02 20:48 ` [Buildroot] [PATCH 5/9] wireshark: add optional c-ares support Gustavo Zacarias
` (6 subsequent siblings)
9 siblings, 1 reply; 25+ messages in thread
From: Gustavo Zacarias @ 2015-12-02 20:48 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/wireshark/wireshark.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 9a8d370..d60f3b4 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -57,4 +57,11 @@ ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_QT5BASE_WIDGETS)
WIRESHARK_CONF_OPTS += --disable-wireshark
endif
+ifeq ($(BR2_PACKAGE_LIBNL),y)
+WIRESHARK_CONF_OPTS += --with-libnl
+WIRESHARK_DEPENDENCIES += libnl
+else
+WIRESHARK_CONF_OPTS += --without-libnl
+endif
+
$(eval $(autotools-package))
--
2.4.10
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 4/9] wireshark: add optional libnl suport
2015-12-02 20:48 ` [Buildroot] [PATCH 4/9] wireshark: add optional libnl suport Gustavo Zacarias
@ 2015-12-02 21:02 ` Yann E. MORIN
0 siblings, 0 replies; 25+ messages in thread
From: Yann E. MORIN @ 2015-12-02 21:02 UTC (permalink / raw)
To: buildroot
Gustavo, All,
On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/wireshark/wireshark.mk | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
> index 9a8d370..d60f3b4 100644
> --- a/package/wireshark/wireshark.mk
> +++ b/package/wireshark/wireshark.mk
> @@ -57,4 +57,11 @@ ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_QT5BASE_WIDGETS)
> WIRESHARK_CONF_OPTS += --disable-wireshark
> endif
>
> +ifeq ($(BR2_PACKAGE_LIBNL),y)
> +WIRESHARK_CONF_OPTS += --with-libnl
> +WIRESHARK_DEPENDENCIES += libnl
> +else
> +WIRESHARK_CONF_OPTS += --without-libnl
> +endif
> +
> $(eval $(autotools-package))
> --
> 2.4.10
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 5/9] wireshark: add optional c-ares support
2015-12-02 20:48 [Buildroot] [PATCH 1/9] wireshark: forcibly disable lua Gustavo Zacarias
` (2 preceding siblings ...)
2015-12-02 20:48 ` [Buildroot] [PATCH 4/9] wireshark: add optional libnl suport Gustavo Zacarias
@ 2015-12-02 20:48 ` Gustavo Zacarias
2015-12-02 21:08 ` Yann E. MORIN
2015-12-02 20:48 ` [Buildroot] [PATCH 6/9] wireshark: gcrypt support is optional Gustavo Zacarias
` (5 subsequent siblings)
9 siblings, 1 reply; 25+ messages in thread
From: Gustavo Zacarias @ 2015-12-02 20:48 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/wireshark/wireshark.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index d60f3b4..2940d26 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -57,6 +57,13 @@ ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_QT5BASE_WIDGETS)
WIRESHARK_CONF_OPTS += --disable-wireshark
endif
+ifeq ($(BR2_PACKAGE_C_ARES),y)
+WIRESHARK_CONF_OPTS += --with-c-ares=$(STAGING_DIR)/usr
+WIRESHARK_DEPENDENCIES += c-ares
+else
+WIREHARK_CONF_OPTS += --without-c-ares
+endif
+
ifeq ($(BR2_PACKAGE_LIBNL),y)
WIRESHARK_CONF_OPTS += --with-libnl
WIRESHARK_DEPENDENCIES += libnl
--
2.4.10
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 5/9] wireshark: add optional c-ares support
2015-12-02 20:48 ` [Buildroot] [PATCH 5/9] wireshark: add optional c-ares support Gustavo Zacarias
@ 2015-12-02 21:08 ` Yann E. MORIN
0 siblings, 0 replies; 25+ messages in thread
From: Yann E. MORIN @ 2015-12-02 21:08 UTC (permalink / raw)
To: buildroot
Gustavo, All,
On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/wireshark/wireshark.mk | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
> index d60f3b4..2940d26 100644
> --- a/package/wireshark/wireshark.mk
> +++ b/package/wireshark/wireshark.mk
> @@ -57,6 +57,13 @@ ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_LIBGTK3)$(BR2_PACKAGE_QT5BASE_WIDGETS)
> WIRESHARK_CONF_OPTS += --disable-wireshark
> endif
>
> +ifeq ($(BR2_PACKAGE_C_ARES),y)
> +WIRESHARK_CONF_OPTS += --with-c-ares=$(STAGING_DIR)/usr
> +WIRESHARK_DEPENDENCIES += c-ares
> +else
> +WIREHARK_CONF_OPTS += --without-c-ares
> +endif
> +
> ifeq ($(BR2_PACKAGE_LIBNL),y)
> WIRESHARK_CONF_OPTS += --with-libnl
> WIRESHARK_DEPENDENCIES += libnl
> --
> 2.4.10
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 6/9] wireshark: gcrypt support is optional
2015-12-02 20:48 [Buildroot] [PATCH 1/9] wireshark: forcibly disable lua Gustavo Zacarias
` (3 preceding siblings ...)
2015-12-02 20:48 ` [Buildroot] [PATCH 5/9] wireshark: add optional c-ares support Gustavo Zacarias
@ 2015-12-02 20:48 ` Gustavo Zacarias
2015-12-02 21:38 ` Yann E. MORIN
2015-12-02 20:48 ` [Buildroot] [PATCH 7/9] wireshark: add optional gnutls support Gustavo Zacarias
` (4 subsequent siblings)
9 siblings, 1 reply; 25+ messages in thread
From: Gustavo Zacarias @ 2015-12-02 20:48 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/wireshark/Config.in | 1 -
package/wireshark/wireshark.mk | 11 +++++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in
index f559c22..52b0f52 100644
--- a/package/wireshark/Config.in
+++ b/package/wireshark/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_WIRESHARK
bool "wireshark"
select BR2_PACKAGE_LIBPCAP
- select BR2_PACKAGE_LIBGCRYPT
select BR2_PACKAGE_LIBGLIB2
depends on BR2_USE_MMU # fork(), glib2
depends on BR2_USE_WCHAR # glib2
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 2940d26..cc9fb41 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -9,9 +9,8 @@ WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions
WIRESHARK_LICENSE = wireshark license
WIRESHARK_LICENSE_FILES = COPYING
-WIRESHARK_DEPENDENCIES = host-pkgconf libpcap libgcrypt libglib2
+WIRESHARK_DEPENDENCIES = host-pkgconf libpcap libglib2
WIRESHARK_CONF_ENV = \
- LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
ac_cv_path_PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
# patch touching configure.ac
@@ -64,6 +63,14 @@ else
WIREHARK_CONF_OPTS += --without-c-ares
endif
+ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
+WIRESHARK_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
+WIRESHARK_CONF_OPTS += --with-gcrypt=yes
+WIRESHARK_DEPENDENCIES += libgcrypt
+else
+WIRESHARK_CONF_OPTS += --with-gcrypt=no
+endif
+
ifeq ($(BR2_PACKAGE_LIBNL),y)
WIRESHARK_CONF_OPTS += --with-libnl
WIRESHARK_DEPENDENCIES += libnl
--
2.4.10
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 6/9] wireshark: gcrypt support is optional
2015-12-02 20:48 ` [Buildroot] [PATCH 6/9] wireshark: gcrypt support is optional Gustavo Zacarias
@ 2015-12-02 21:38 ` Yann E. MORIN
0 siblings, 0 replies; 25+ messages in thread
From: Yann E. MORIN @ 2015-12-02 21:38 UTC (permalink / raw)
To: buildroot
Gustavo, All,
On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/wireshark/Config.in | 1 -
> package/wireshark/wireshark.mk | 11 +++++++++--
> 2 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/package/wireshark/Config.in b/package/wireshark/Config.in
> index f559c22..52b0f52 100644
> --- a/package/wireshark/Config.in
> +++ b/package/wireshark/Config.in
> @@ -1,7 +1,6 @@
> config BR2_PACKAGE_WIRESHARK
> bool "wireshark"
> select BR2_PACKAGE_LIBPCAP
> - select BR2_PACKAGE_LIBGCRYPT
> select BR2_PACKAGE_LIBGLIB2
> depends on BR2_USE_MMU # fork(), glib2
> depends on BR2_USE_WCHAR # glib2
> diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
> index 2940d26..cc9fb41 100644
> --- a/package/wireshark/wireshark.mk
> +++ b/package/wireshark/wireshark.mk
> @@ -9,9 +9,8 @@ WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2
> WIRESHARK_SITE = http://www.wireshark.org/download/src/all-versions
> WIRESHARK_LICENSE = wireshark license
> WIRESHARK_LICENSE_FILES = COPYING
> -WIRESHARK_DEPENDENCIES = host-pkgconf libpcap libgcrypt libglib2
> +WIRESHARK_DEPENDENCIES = host-pkgconf libpcap libglib2
> WIRESHARK_CONF_ENV = \
> - LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \
> ac_cv_path_PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config
>
> # patch touching configure.ac
> @@ -64,6 +63,14 @@ else
> WIREHARK_CONF_OPTS += --without-c-ares
> endif
>
> +ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
> +WIRESHARK_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
> +WIRESHARK_CONF_OPTS += --with-gcrypt=yes
> +WIRESHARK_DEPENDENCIES += libgcrypt
> +else
> +WIRESHARK_CONF_OPTS += --with-gcrypt=no
> +endif
> +
> ifeq ($(BR2_PACKAGE_LIBNL),y)
> WIRESHARK_CONF_OPTS += --with-libnl
> WIRESHARK_DEPENDENCIES += libnl
> --
> 2.4.10
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 7/9] wireshark: add optional gnutls support
2015-12-02 20:48 [Buildroot] [PATCH 1/9] wireshark: forcibly disable lua Gustavo Zacarias
` (4 preceding siblings ...)
2015-12-02 20:48 ` [Buildroot] [PATCH 6/9] wireshark: gcrypt support is optional Gustavo Zacarias
@ 2015-12-02 20:48 ` Gustavo Zacarias
2015-12-02 21:43 ` Yann E. MORIN
2015-12-02 20:48 ` [Buildroot] [PATCH 8/9] wireshark: add optional geoip support Gustavo Zacarias
` (3 subsequent siblings)
9 siblings, 1 reply; 25+ messages in thread
From: Gustavo Zacarias @ 2015-12-02 20:48 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
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 cc9fb41..0bc7801 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -22,7 +22,6 @@ WIRESHARK_CONF_OPTS = \
--without-krb5 \
--disable-usr-local \
--enable-static=no \
- --with-gnutls=no \
--with-libsmi=no \
--with-lua=no \
--includedir=$(STAGING_DIR)/usr/include
@@ -63,6 +62,13 @@ else
WIREHARK_CONF_OPTS += --without-c-ares
endif
+ifeq ($(BR2_PACKAGE_GNUTLS),y)
+WIRESHARK_CONF_OPTS += --with-gnutls=yes
+WIRESHARK_DEPENDENCIES += gnutls
+else
+WIRESHARK_CONF_OPTS += --with-gnutls=no
+endif
+
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
WIRESHARK_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
WIRESHARK_CONF_OPTS += --with-gcrypt=yes
--
2.4.10
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 7/9] wireshark: add optional gnutls support
2015-12-02 20:48 ` [Buildroot] [PATCH 7/9] wireshark: add optional gnutls support Gustavo Zacarias
@ 2015-12-02 21:43 ` Yann E. MORIN
0 siblings, 0 replies; 25+ messages in thread
From: Yann E. MORIN @ 2015-12-02 21:43 UTC (permalink / raw)
To: buildroot
Gustavo, All,
On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> 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 cc9fb41..0bc7801 100644
> --- a/package/wireshark/wireshark.mk
> +++ b/package/wireshark/wireshark.mk
> @@ -22,7 +22,6 @@ WIRESHARK_CONF_OPTS = \
> --without-krb5 \
> --disable-usr-local \
> --enable-static=no \
> - --with-gnutls=no \
> --with-libsmi=no \
> --with-lua=no \
> --includedir=$(STAGING_DIR)/usr/include
> @@ -63,6 +62,13 @@ else
> WIREHARK_CONF_OPTS += --without-c-ares
> endif
>
> +ifeq ($(BR2_PACKAGE_GNUTLS),y)
> +WIRESHARK_CONF_OPTS += --with-gnutls=yes
> +WIRESHARK_DEPENDENCIES += gnutls
> +else
> +WIRESHARK_CONF_OPTS += --with-gnutls=no
> +endif
> +
> ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
> WIRESHARK_CONF_ENV = LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config
> WIRESHARK_CONF_OPTS += --with-gcrypt=yes
> --
> 2.4.10
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 8/9] wireshark: add optional geoip support
2015-12-02 20:48 [Buildroot] [PATCH 1/9] wireshark: forcibly disable lua Gustavo Zacarias
` (5 preceding siblings ...)
2015-12-02 20:48 ` [Buildroot] [PATCH 7/9] wireshark: add optional gnutls support Gustavo Zacarias
@ 2015-12-02 20:48 ` Gustavo Zacarias
2015-12-02 21:52 ` Yann E. MORIN
2015-12-02 20:48 ` [Buildroot] [PATCH 9/9] wireshark: add optional sbc support Gustavo Zacarias
` (2 subsequent siblings)
9 siblings, 1 reply; 25+ messages in thread
From: Gustavo Zacarias @ 2015-12-02 20:48 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/wireshark/wireshark.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 0bc7801..534131b 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -62,6 +62,13 @@ else
WIREHARK_CONF_OPTS += --without-c-ares
endif
+ifeq ($(BR2_PACKAGE_GEOIP),y)
+WIRESHARK_CONF_OPTS += --with-geoip=$(STAGING_DIR)/usr
+WIRESHARK_DEPENDENCIES += geoip
+else
+WIRESHARK_CONF_OPTS += --without-geoip
+endif
+
ifeq ($(BR2_PACKAGE_GNUTLS),y)
WIRESHARK_CONF_OPTS += --with-gnutls=yes
WIRESHARK_DEPENDENCIES += gnutls
--
2.4.10
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 8/9] wireshark: add optional geoip support
2015-12-02 20:48 ` [Buildroot] [PATCH 8/9] wireshark: add optional geoip support Gustavo Zacarias
@ 2015-12-02 21:52 ` Yann E. MORIN
2015-12-02 22:17 ` Gustavo Zacarias
0 siblings, 1 reply; 25+ messages in thread
From: Yann E. MORIN @ 2015-12-02 21:52 UTC (permalink / raw)
To: buildroot
Gustavo, All,
On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
> package/wireshark/wireshark.mk | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
> index 0bc7801..534131b 100644
> --- a/package/wireshark/wireshark.mk
> +++ b/package/wireshark/wireshark.mk
> @@ -62,6 +62,13 @@ else
> WIREHARK_CONF_OPTS += --without-c-ares
> endif
>
> +ifeq ($(BR2_PACKAGE_GEOIP),y)
> +WIRESHARK_CONF_OPTS += --with-geoip=$(STAGING_DIR)/usr
Is it needed to specify the path? Can't we just have;
WIRESHARK_CONF_OPTS += --with-geoip
If the path is needed, then a little blrb in the commit log would be
nice.
And I forgot to add a similar comment for the --with-XXX=yes options.
Regards,
Yann E. MORIN.
> +WIRESHARK_DEPENDENCIES += geoip
> +else
> +WIRESHARK_CONF_OPTS += --without-geoip
> +endif
> +
> ifeq ($(BR2_PACKAGE_GNUTLS),y)
> WIRESHARK_CONF_OPTS += --with-gnutls=yes
> WIRESHARK_DEPENDENCIES += gnutls
> --
> 2.4.10
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 8/9] wireshark: add optional geoip support
2015-12-02 21:52 ` Yann E. MORIN
@ 2015-12-02 22:17 ` Gustavo Zacarias
0 siblings, 0 replies; 25+ messages in thread
From: Gustavo Zacarias @ 2015-12-02 22:17 UTC (permalink / raw)
To: buildroot
On 02/12/15 18:52, Yann E. MORIN wrote:
> Is it needed to specify the path? Can't we just have;
> WIRESHARK_CONF_OPTS += --with-geoip
>
> If the path is needed, then a little blrb in the commit log would be
> nice.
>
> And I forgot to add a similar comment for the --with-XXX=yes options.
Hi.
I don't have geoip in the distro, however it doesn't use pkgconfig so in
this case and given other wireshark options having issues "better safe
than sorry".
Regards.
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 9/9] wireshark: add optional sbc support
2015-12-02 20:48 [Buildroot] [PATCH 1/9] wireshark: forcibly disable lua Gustavo Zacarias
` (6 preceding siblings ...)
2015-12-02 20:48 ` [Buildroot] [PATCH 8/9] wireshark: add optional geoip support Gustavo Zacarias
@ 2015-12-02 20:48 ` Gustavo Zacarias
2015-12-02 20:56 ` Baruch Siach
2015-12-16 22:50 ` Thomas Petazzoni
2015-12-02 20:57 ` [Buildroot] [PATCH 1/9] wireshark: forcibly disable lua Yann E. MORIN
2015-12-03 21:39 ` Peter Korsgaard
9 siblings, 2 replies; 25+ messages in thread
From: Gustavo Zacarias @ 2015-12-02 20:48 UTC (permalink / raw)
To: buildroot
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
package/wireshark/wireshark.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
index 534131b..e44f26a 100644
--- a/package/wireshark/wireshark.mk
+++ b/package/wireshark/wireshark.mk
@@ -91,4 +91,11 @@ else
WIRESHARK_CONF_OPTS += --without-libnl
endif
+ifeq ($(BR2_PACKAGE_SBC),y)
+WIRESHARK_CONF_OPTS += --with-sbc=yes
+WIRESHARK_DEPENDENCIES += sbc
+else
+WIRESHARK_CONF_OPTS += --with-sbc=no
+endif
+
$(eval $(autotools-package))
--
2.4.10
^ permalink raw reply related [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 9/9] wireshark: add optional sbc support
2015-12-02 20:48 ` [Buildroot] [PATCH 9/9] wireshark: add optional sbc support Gustavo Zacarias
@ 2015-12-02 20:56 ` Baruch Siach
2015-12-02 20:59 ` Gustavo Zacarias
2015-12-16 22:50 ` Thomas Petazzoni
1 sibling, 1 reply; 25+ messages in thread
From: Baruch Siach @ 2015-12-02 20:56 UTC (permalink / raw)
To: buildroot
Hi Gustavo,
On Wed, Dec 02, 2015 at 05:48:21PM -0300, Gustavo Zacarias wrote:
> +ifeq ($(BR2_PACKAGE_SBC),y)
> +WIRESHARK_CONF_OPTS += --with-sbc=yes
> +WIRESHARK_DEPENDENCIES += sbc
> +else
> +WIRESHARK_CONF_OPTS += --with-sbc=no
> +endif
Which package is that? I couldn't find BR2_PACKAGE_SBC in current master.
baruch
--
http://baruch.siach.name/blog/ ~. .~ Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
- baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
^ permalink raw reply [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 9/9] wireshark: add optional sbc support
2015-12-02 20:56 ` Baruch Siach
@ 2015-12-02 20:59 ` Gustavo Zacarias
2015-12-02 21:11 ` Yann E. MORIN
0 siblings, 1 reply; 25+ messages in thread
From: Gustavo Zacarias @ 2015-12-02 20:59 UTC (permalink / raw)
To: buildroot
On 02/12/15 17:56, Baruch Siach wrote:
> Hi Gustavo,
>
> On Wed, Dec 02, 2015 at 05:48:21PM -0300, Gustavo Zacarias wrote:
>> +ifeq ($(BR2_PACKAGE_SBC),y)
>> +WIRESHARK_CONF_OPTS += --with-sbc=yes
>> +WIRESHARK_DEPENDENCIES += sbc
>> +else
>> +WIRESHARK_CONF_OPTS += --with-sbc=no
>> +endif
>
> Which package is that? I couldn't find BR2_PACKAGE_SBC in current master.
Hi Baruch.
http://patchwork.ozlabs.org/patch/545815/
Already warned Peter about that prereq on IRC.
Regards.
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 9/9] wireshark: add optional sbc support
2015-12-02 20:59 ` Gustavo Zacarias
@ 2015-12-02 21:11 ` Yann E. MORIN
0 siblings, 0 replies; 25+ messages in thread
From: Yann E. MORIN @ 2015-12-02 21:11 UTC (permalink / raw)
To: buildroot
Gustavo, All,
On 2015-12-02 17:59 -0300, Gustavo Zacarias spake thusly:
> On 02/12/15 17:56, Baruch Siach wrote:
>
> >Hi Gustavo,
> >
> >On Wed, Dec 02, 2015 at 05:48:21PM -0300, Gustavo Zacarias wrote:
> >>+ifeq ($(BR2_PACKAGE_SBC),y)
> >>+WIRESHARK_CONF_OPTS += --with-sbc=yes
> >>+WIRESHARK_DEPENDENCIES += sbc
> >>+else
> >>+WIRESHARK_CONF_OPTS += --with-sbc=no
> >>+endif
> >
> >Which package is that? I couldn't find BR2_PACKAGE_SBC in current master.
>
> Hi Baruch.
> http://patchwork.ozlabs.org/patch/545815/
> Already warned Peter about that prereq on IRC.
Then, you could have said so in a post-commit note, so we all know that
this package is pending in the patchwork.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 9/9] wireshark: add optional sbc support
2015-12-02 20:48 ` [Buildroot] [PATCH 9/9] wireshark: add optional sbc support Gustavo Zacarias
2015-12-02 20:56 ` Baruch Siach
@ 2015-12-16 22:50 ` Thomas Petazzoni
1 sibling, 0 replies; 25+ messages in thread
From: Thomas Petazzoni @ 2015-12-16 22:50 UTC (permalink / raw)
To: buildroot
Dear Gustavo Zacarias,
On Wed, 2 Dec 2015 17:48:21 -0300, Gustavo Zacarias wrote:
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
> package/wireshark/wireshark.mk | 7 +++++++
> 1 file changed, 7 insertions(+)
Applied, thanks.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 25+ messages in thread
* [Buildroot] [PATCH 1/9] wireshark: forcibly disable lua
2015-12-02 20:48 [Buildroot] [PATCH 1/9] wireshark: forcibly disable lua Gustavo Zacarias
` (7 preceding siblings ...)
2015-12-02 20:48 ` [Buildroot] [PATCH 9/9] wireshark: add optional sbc support Gustavo Zacarias
@ 2015-12-02 20:57 ` Yann E. MORIN
2015-12-02 21:02 ` Gustavo Zacarias
2015-12-03 21:39 ` Peter Korsgaard
9 siblings, 1 reply; 25+ messages in thread
From: Yann E. MORIN @ 2015-12-02 20:57 UTC (permalink / raw)
To: buildroot
Gustavo, All,
On 2015-12-02 17:48 -0300, Gustavo Zacarias spake thusly:
> If host arch = target arch and liblua is in the host the buildsystem
> will pick it up and try to use it since it passes basic build tests.
> Forcibly disable it, since it causes no build failure, rather runtime
> failures because said liblua is not present on the target.
>
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
> ---
> package/wireshark/wireshark.mk | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/package/wireshark/wireshark.mk b/package/wireshark/wireshark.mk
> index 366134d..867b945 100644
> --- a/package/wireshark/wireshark.mk
> +++ b/package/wireshark/wireshark.mk
> @@ -26,6 +26,7 @@ WIRESHARK_CONF_OPTS = \
> --enable-static=no \
> --with-gnutls=no \
> --with-libsmi=no \
> + --with-lua=no \
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
However, why not conditionally add it, like o:
ifeq ($(BR2_PACKAGE_LUA),y)
WIRESHARK_DEPENDENCIES += lua
else
WIRESHARK_CONF_OPTS += --with-lua=no
endif
Regards,
Yann E. MORIN.
> --includedir=$(STAGING_DIR)/usr/include
>
> $(eval $(autotools-package))
> --
> 2.4.10
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 25+ messages in thread* [Buildroot] [PATCH 1/9] wireshark: forcibly disable lua
2015-12-02 20:48 [Buildroot] [PATCH 1/9] wireshark: forcibly disable lua Gustavo Zacarias
` (8 preceding siblings ...)
2015-12-02 20:57 ` [Buildroot] [PATCH 1/9] wireshark: forcibly disable lua Yann E. MORIN
@ 2015-12-03 21:39 ` Peter Korsgaard
9 siblings, 0 replies; 25+ messages in thread
From: Peter Korsgaard @ 2015-12-03 21:39 UTC (permalink / raw)
To: buildroot
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:
> If host arch = target arch and liblua is in the host the buildsystem
> will pick it up and try to use it since it passes basic build tests.
> Forcibly disable it, since it causes no build failure, rather runtime
> failures because said liblua is not present on the target.
> Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
Committed patch 1-8, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 25+ messages in thread