From: Adam Duskett <aduskett@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [V2 2/2] sngrep: fix error if gnutls and openssl are both enabled.
Date: Thu, 26 Jan 2017 16:39:31 -0500 [thread overview]
Message-ID: <20170126213931.9987-2-aduskett@codeblue.com> (raw)
In-Reply-To: <20170126213931.9987-1-aduskett@codeblue.com>
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
next prev parent reply other threads:[~2017-01-26 21:39 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-26 21:39 [Buildroot] [V2 1/2] sngrep: fix dependency error Adam Duskett
2017-01-26 21:39 ` Adam Duskett [this message]
2017-01-27 7:32 ` [Buildroot] [V2 2/2] sngrep: fix error if gnutls and openssl are both enabled Thomas Petazzoni
2017-01-27 5:28 ` [Buildroot] [V2 1/2] sngrep: fix dependency error Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170126213931.9987-2-aduskett@codeblue.com \
--to=aduskett@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.