[OE-core] [meta-oe][PATCH] libgcrypt: provide libgcrypt-config wrapper around pkg-config

[Jussi Laako]

This patch adds a libgcrypt-config wrapper for pkg-config support in
order to avoid patching all upstream packages using libgcrypt, while
otherwise keeping pkg-config functionality.

Also updates libgcrypt version from 1.8.0 to 1.8.1.

Signed-off-by: Jussi Laako <jussi.laako at linux.intel.com>
---
 .../libgcrypt/{libgcrypt_1.8.0.bb => libgcrypt_1.8.1.bb}    | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
 rename meta/recipes-support/libgcrypt/{libgcrypt_1.8.0.bb => libgcrypt_1.8.1.bb} (81%)

diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.8.0.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.8.1.bb
similarity index 81%
rename from meta/recipes-support/libgcrypt/libgcrypt_1.8.0.bb
rename to meta/recipes-support/libgcrypt/libgcrypt_1.8.1.bb
index 1797d9584d..529882d8a4 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.8.0.bb
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.8.1.bb
@@ -15,18 +15,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
 DEPENDS = "libgpg-error"
 
 UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
-SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.gz \
+SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \
            file://0001-Add-and-use-pkg-config-for-libgcrypt-instead-of-conf.patch \
            file://0003-tests-bench-slope.c-workaround-ICE-failure-on-mips-w.patch \
            file://0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \
            file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \
+           file://libgcrypt-config-wrapper.patch \
 "
-SRC_URI[md5sum] = "110ce4352f9ea6f560bdc6c5644ae93c"
-SRC_URI[sha256sum] = "f6e470b7f2d3a703e8747f05a8c19d9e10e26ebf2d5f3d71ff75a40f504e12ee"
+SRC_URI[md5sum] = "b21817f9d850064d2177285f1073ec55"
+SRC_URI[sha256sum] = "7a2875f8b1ae0301732e878c0cca2c9664ff09ef71408f085c50e332656a78b3"
 
-BINCONFIG = "${bindir}/libgcrypt-config"
-
-inherit autotools texinfo binconfig-disabled pkgconfig
+inherit autotools texinfo pkgconfig binconfig
 
 EXTRA_OECONF = "--disable-asm"
 EXTRA_OEMAKE_class-target = "LIBTOOLFLAGS='--tag=CC'"
@@ -47,7 +46,7 @@ do_install_append() {
 
 PACKAGES =+ "dumpsexp-dev"
 
-FILES_${PN}-dev += "${bindir}/hmac256"
+FILES_${PN}-dev += "${bindir}/hmac256 ${bindir}/libgcrypt-config"
 FILES_dumpsexp-dev += "${bindir}/dumpsexp"
 
 BBCLASSEXTEND = "native nativesdk"
-- 
2.11.0