[ptxdist] [PATCH 2/3] gnutls: add support for openssl compatibility

[Alexander Aring <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>
---
There are two issues and I am not sure if it's still okay.
1:
Packages which needs GNUTLS_OPENSSL need to select GNUTLS and GNUTLS_OPENSSL.
Is there a way to select GNUTLS if GNUTLS_OPENSSL is selected? I get some
trouble if I make a select GNUTLS in GNUTLS_OPENSSL because the if GNUTLS
above.

2:
The default is to generate the gnutls openssl compatibility library but this
wasn't installed before. Now the default is --disable--openssl-compatibility
and only install the library if it enabled. I think this should not make
trouble in other package which used gnutls.

 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