[Buildroot] [V2 1/2] sngrep: fix dependency error.

[Buildroot] [V2 1/2] sngrep: fix dependency error.

[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 <aduskett@codeblue.com>
---
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(-)

diff --git a/package/sngrep/Config.in b/package/sngrep/Config.in
index 4d0d80c..fc27413 100644
--- a/package/sngrep/Config.in
+++ b/package/sngrep/Config.in
@@ -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
diff --git a/package/sngrep/sngrep.mk b/package/sngrep/sngrep.mk
index f504771..5b51762 100644
--- a/package/sngrep/sngrep.mk
+++ b/package/sngrep/sngrep.mk
@@ -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
-- 
2.9.3

[Buildroot] [V2 2/2] sngrep: fix error if gnutls and openssl are both enabled.

[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 <aduskett@codeblue.com>
---
v1 -> v2:
  - Changed else to else ifeq ($(BR2_PACKAGE_GNUTLS),y)
  
 package/sngrep/sngrep.mk | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/package/sngrep/sngrep.mk b/package/sngrep/sngrep.mk
index 5b51762..0008c1d 100644
--- a/package/sngrep/sngrep.mk
+++ b/package/sngrep/sngrep.mk
@@ -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
 
-- 
2.9.3

[Buildroot] [V2 1/2] sngrep: fix dependency error.

[Thomas Petazzoni]

Hello,

On Thu, 26 Jan 2017 16:39:30 -0500, Adam Duskett wrote:
> 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 <aduskett@codeblue.com>

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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[Buildroot] [V2 2/2] sngrep: fix error if gnutls and openssl are both enabled.

[Thomas Petazzoni]

Hello,

On Thu, 26 Jan 2017 16:39:31 -0500, Adam Duskett wrote:
> 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 <aduskett@codeblue.com>

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
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com