Skip to contentSkip to conversation

sngrep: fix dependency error.

PATCH New Adam Duskett 2 participants 4 messages Jan 26, 2017 – Jan 27, 2017

lore
Share & tools
lore

Adam Duskett

author
#0 lore raw

PATCH v2 1/2 sngrep: fix dependency error.

sngrep will complain if libgcrypt isn't compiled. I am not sure how or why I didn't notice this issue to begin with, but
I added it as a dependency and select it in the Config.in file now. I also added 'depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS' as per baruch's suggestion.

Signed-off-by Adam Duskett <[email protected]>

---
v1 -> v2:
- Added 'depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS' to Config.in
- Split changes into two patches.

 package/sngrep/Config.in | 2 ++
 package/sngrep/sngrep.mk | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)
package/sngrep/Config.in +2 -0
index 4d0d80c..fc27413 100644
@@ -3,9 +3,11 @@ comment "sngrep needs a toolchain w/ threads"
 
 config BR2_PACKAGE_SNGREP
 	bool "sngrep"
+	depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	select BR2_PACKAGE_NCURSES
 	select BR2_PACKAGE_LIBPCAP
+	select BR2_PACKAGE_LIBGCRYPT
 	help
 	  sngrep is a tool for displaying SIP calls message flows from
 	  terminal.  It supports live capture to display realtime SIP
package/sngrep/sngrep.mk +1 -1
index f504771..5b51762 100644
@@ -9,7 +9,7 @@ SNGREP_SITE = $(call github,irontec,sngrep,$(SNGREP_VERSION))
 SNGREP_LICENSE = GPLv3+
 SNGREP_LICENSE_FILES = LICENSE
 SNGREP_AUTORECONF = YES
-SNGREP_DEPENDENCIES = libpcap ncurses
+SNGREP_DEPENDENCIES = libpcap ncurses libgcrypt
 
 # our ncurses wchar support is not properly detected
 SNGREP_CONF_OPTS += --disable-unicode
Signature · 1 line
2.9.3
author
#1 lore raw

PATCH v2 2/2 sngrep: fix error if gnutls and openssl are both enabled.

With the changes applied by thomas I noticed that sngrep will now fail to configure if both openssl and gnutls are selected (both can't be enabled at the same time.) I set openssl to take precidence over gnutls, mainly because it's the larger of the two dependencies, and if the user has selected it they probably want to use it.

Signed-off-by Adam Duskett <[email protected]>

---
v1 -> v2:
- Changed else to else ifeq ($(BR2_PACKAGE_GNUTLS),y)

 package/sngrep/sngrep.mk | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
package/sngrep/sngrep.mk +5 -8
index 5b51762..0008c1d 100644
@@ -14,17 +14,14 @@ SNGREP_DEPENDENCIES = libpcap ncurses libgcrypt
 # our ncurses wchar support is not properly detected
 SNGREP_CONF_OPTS += --disable-unicode
 
-ifeq ($(BR2_PACKAGE_GNUTLS),y)
-SNGREP_DEPENDENCIES += gnutls
-SNGREP_CONF_OPTS += --with-gnutls
-else
-SNGREP_CONF_OPTS += --without-gnutls
-endif
-
+# openssl and gnutls can't be enable at the same time.
 ifeq ($(BR2_PACKAGE_OPENSSL),y)
 SNGREP_DEPENDENCIES += openssl
 SNGREP_CONF_OPTS += --with-openssl
-else
+SNGREP_CONF_OPTS += --without-gnutls
+else ifeq ($(BR2_PACKAGE_GNUTLS),y)
+SNGREP_DEPENDENCIES += gnutls
+SNGREP_CONF_OPTS += --with-gnutls
 SNGREP_CONF_OPTS += --without-openssl
 endif
Signature · 1 line
2.9.3
Applied
#2 lore raw

PATCH v2 2/2 sngrep: fix error if gnutls and openssl are both enabled.

Hello,

Quoted 8 lines · Adam Duskett

With the changes applied by thomas I noticed that sngrep will now fail to configure if both openssl and gnutls are selected (both can't be enabled at the same time.) I set openssl to take precidence over gnutls, mainly because it's the larger of the two dependencies, and if the user has selected it they probably want to use it.

Signed-off-by Adam Duskett <[email protected]>

Applied, with the following changes:

[Thomas:
- regroup CONF_OPTS lines
- add an 'else' clause to explicitly disable gnutls and openssl when none are available
- add a reference to the autobuilder failure]

I've also made a separate commit to fix the libgcrypt issue, see:

https://git.buildroot.org/buildroot/commit/?id=6205b75873cefe5376f49934f456729f5de6ee1f

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#3 lore raw

PATCH v2 1/2 sngrep: fix dependency error.

In reply to Adam Duskett

Hello,

Quoted 7 lines · Adam Duskett

sngrep will complain if libgcrypt isn't compiled. I am not sure how or why I didn't notice this issue to begin with, but
I added it as a dependency and select it in the Config.in file now. I also added 'depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS' as per baruch's suggestion.

Signed-off-by Adam Duskett <[email protected]>

sngrep builds just fine for me without libgcrypt, so clearly this isn't needed.

What however is needed is that libgcrypt is needed when gnutls support is enabled.

Best regards,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com