1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00

gnupg: 2.1.2 -> 2.1.4

Updated dirmngr-uses-libgpg-error.patch.

(From OE-Core rev: 9c5cb4e2b51e605523d636f57d071593a01014ee)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang
2015-05-27 22:34:15 -07:00
committed by Richard Purdie
parent 917ca4d70b
commit b47ef4ff7e
2 changed files with 6 additions and 6 deletions
@@ -4,13 +4,13 @@ Index: gnupg-2.1.0/dirmngr/Makefile.am
=================================================================== ===================================================================
--- gnupg-2.1.0.orig/dirmngr/Makefile.am --- gnupg-2.1.0.orig/dirmngr/Makefile.am
+++ gnupg-2.1.0/dirmngr/Makefile.am +++ gnupg-2.1.0/dirmngr/Makefile.am
@@ -71,7 +71,8 @@ endif @@ -78,7 +78,8 @@ endif
dirmngr_LDADD = $(libcommontlsnpth) $(libcommonpth) \ dirmngr_LDADD = $(libcommontlsnpth) $(libcommonpth) \
../gl/libgnu.a $(DNSLIBS) $(LIBASSUAN_LIBS) \ $(DNSLIBS) $(LIBASSUAN_LIBS) \
$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \
- $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) - $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV)
+ $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) \ + $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) \
+ $(GPG_ERROR_LIBS) + $(GPG_ERROR_LIBS)
if !USE_LDAPWRAPPER if USE_LDAP
dirmngr_LDADD += $(ldaplibs) dirmngr_LDADD += $(ldaplibs)
endif endif
@@ -14,8 +14,8 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \
file://dirmngr-uses-libgpg-error.patch \ file://dirmngr-uses-libgpg-error.patch \
" "
SRC_URI[md5sum] = "156fbd6566f4c51caac741c858d30d96" SRC_URI[md5sum] = "c36f1a4c261ecc81fa5df551356c33f1"
SRC_URI[sha256sum] = "404f5a43d591dfe41f0ffb204b49a1533b67d77bc1fd68febd7e447575616792" SRC_URI[sha256sum] = "64127eedd868510f2bccccb22c507a4878ffa07495db16a0f976c67f56426cb0"
EXTRA_OECONF = "--disable-ldap \ EXTRA_OECONF = "--disable-ldap \
--disable-ccid-driver \ --disable-ccid-driver \