[meta-security] xmlsec1: Make the crypto libraries a PACKAGECONFIG

Submitted by Adrian Bunk on Jan. 30, 2019, 9:57 a.m. | Patch ID: 158366

Details

Message ID 20190130095743.12467-2-bunk@stusta.de
State New
Headers show

Commit Message

Adrian Bunk Jan. 30, 2019, 9:57 a.m.
Usually one doesn't need variants for all 4 different
crypto libraries installed at the same time.

Also remove a libgpg-error DEPENDS that is not used
directly by xmlsec1.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
---
 recipes-security/xmlsec1/xmlsec1_1.2.26.bb | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Patch hide | download patch | download mbox

diff --git a/recipes-security/xmlsec1/xmlsec1_1.2.26.bb b/recipes-security/xmlsec1/xmlsec1_1.2.26.bb
index aca9634..4bdf498 100644
--- a/recipes-security/xmlsec1/xmlsec1_1.2.26.bb
+++ b/recipes-security/xmlsec1/xmlsec1_1.2.26.bb
@@ -5,7 +5,7 @@  DESCRIPTION = "\
     XML security standards "XML Digital Signature" and "XML Encryption". \
     "
 HOMEPAGE = "http://www.aleksey.com/xmlsec/"
-DEPENDS = "libtool libxml2 libxslt openssl zlib libgcrypt gnutls nss nspr libgpg-error"
+DEPENDS = "libtool libxml2 libxslt zlib"
 
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://COPYING;md5=352791d62092ea8104f085042de7f4d0"
@@ -28,9 +28,11 @@  inherit autotools-brokensep ptest pkgconfig
 CFLAGS += "-I${STAGING_INCDIR}/nspr4 -I${STAGING_INCDIR}/nss3"
 CPPFLAGS += "-I${STAGING_INCDIR}/nspr4 -I${STAGING_INCDIR}/nss3"
 
-EXTRA_OECONF = "\
-    --with-nss=${STAGING_LIBDIR}/../.. --with-nspr=${STAGING_LIBDIR}/../.. \
-    "
+PACKAGECONFIG ??= "gnutls libgcrypt nss openssl"
+PACKAGECONFIG[gnutls] = ",,gnutls"
+PACKAGECONFIG[libgcrypt] = ",,libgcrypt"
+PACKAGECONFIG[nss] = "--with-nss=${STAGING_LIBDIR}/../.. --with-nspr=${STAGING_LIBDIR}/../..,,nss nspr"
+PACKAGECONFIG[openssl] = ",,openssl"
 
 # these can be dynamically loaded with xmlSecCryptoDLLoadLibrary()
 FILES_SOLIBSDEV = "${libdir}/libxmlsec1.so"