mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Alexander Aring <alex.aring@gmail.com>
To: ptxdist@pengutronix.de
Cc: j.beisert@pengutronix.de, Alexander Aring <alex.aring@gmail.com>
Subject: [ptxdist] [PATCH v2 2/3] gnutls: add support for openssl compatibility
Date: Sun, 26 Jan 2014 11:23:10 +0100	[thread overview]
Message-ID: <1390731791-701-2-git-send-email-alex.aring@gmail.com> (raw)
In-Reply-To: <1390731791-701-1-git-send-email-alex.aring@gmail.com>

This patch adds a openssl compatibility option to gnutls and install the
gnutls openssl compatibility library if enabled.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
---
 rules/gnutls.in   | 15 +++++++++++++--
 rules/gnutls.make |  5 +++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/rules/gnutls.in b/rules/gnutls.in
index 10a181e..3a5bd3a 100644
--- a/rules/gnutls.in
+++ b/rules/gnutls.in
@@ -1,10 +1,11 @@
 ## SECTION=networking
 
-config GNUTLS
+menuconfig GNUTLS
 	tristate
 	select LIBGCRYPT
 	select LIBTASN1
-	prompt "gnutls"
+	select OPENSSL		if GNUTLS_OPENSSL
+	prompt "gnutls                        "
 	help
 	  GnuTLS is a secure communications library implementing the SSL,
 	  TLS and DTLS protocols and technologies around them.
@@ -13,3 +14,13 @@ config GNUTLS
 	  APIs to parse and write X.509, PKCS #12, OpenPGP and other required
 	  structures. It is aimed to be portable and efficient with focus on
 	  security and interoperability.
+
+if GNUTLS
+
+config GNUTLS_OPENSSL
+	bool
+	prompt "openssl compatibility"
+	help
+	  Enables the OpenSSL compatibility support.
+
+endif
diff --git a/rules/gnutls.make b/rules/gnutls.make
index b64a36c..08923ae 100644
--- a/rules/gnutls.make
+++ b/rules/gnutls.make
@@ -38,6 +38,7 @@ GNUTLS_CONF_OPT		:= \
 	--with-libgcrypt \
 	--with-libgcrypt-prefix=$(PTXDIST_SYSROOT_TARGET)/usr \
 	--without-p11-kit \
+	--$(call ptx/endis, PTXCONF_GNUTLS_OPENSSL)-openssl-compatibility \
 	--disable-guile
 
 # ----------------------------------------------------------------------------
@@ -55,6 +56,10 @@ $(STATEDIR)/gnutls.targetinstall:
 
 	@$(call install_lib, gnutls, 0, 0, 0644, libgnutls)
 
+ifdef PTXCONF_GNUTLS_OPENSSL
+	@$(call install_lib, gnutls, 0, 0, 0644, libgnutls-openssl)
+endif
+
 	@$(call install_finish, gnutls)
 
 	@$(call touch)
-- 
1.8.5.3


-- 
ptxdist mailing list
ptxdist@pengutronix.de

  reply	other threads:[~2014-01-26 10:23 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-26 10:23 [ptxdist] [PATCH v2 1/3] inetutils: add missing depends on !BUSYBOX_TFTPD Alexander Aring
2014-01-26 10:23 ` Alexander Aring [this message]
2014-01-26 10:23 ` [ptxdist] [PATCH v2 3/3] iputils: add new package iputils Alexander Aring
2014-01-26 10:24 ` [ptxdist] [PATCH v2 1/3] inetutils: add missing depends on !BUSYBOX_TFTPD Alexander Aring
  -- strict thread matches above, loose matches on Subject: below --
2014-01-26  9:41 Alexander Aring
2014-01-26  9:41 ` [ptxdist] [PATCH v2 2/3] gnutls: add support for openssl compatibility Alexander Aring

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=1390731791-701-2-git-send-email-alex.aring@gmail.com \
    --to=alex.aring@gmail.com \
    --cc=j.beisert@pengutronix.de \
    --cc=ptxdist@pengutronix.de \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox