From b47ef4ff7ecccabbdc9b383e0c883693d2f38e8e Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Wed, 27 May 2015 22:34:15 -0700 Subject: gnupg: 2.1.2 -> 2.1.4 Updated dirmngr-uses-libgpg-error.patch. (From OE-Core rev: 9c5cb4e2b51e605523d636f57d071593a01014ee) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/recipes-support/gnupg/gnupg') diff --git a/meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch b/meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch index 3dc506c2f2..7af1955d52 100644 --- a/meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch +++ b/meta/recipes-support/gnupg/gnupg/dirmngr-uses-libgpg-error.patch @@ -4,13 +4,13 @@ Index: gnupg-2.1.0/dirmngr/Makefile.am =================================================================== --- gnupg-2.1.0.orig/dirmngr/Makefile.am +++ gnupg-2.1.0/dirmngr/Makefile.am -@@ -71,7 +71,8 @@ endif +@@ -78,7 +78,8 @@ endif dirmngr_LDADD = $(libcommontlsnpth) $(libcommonpth) \ - ../gl/libgnu.a $(DNSLIBS) $(LIBASSUAN_LIBS) \ + $(DNSLIBS) $(LIBASSUAN_LIBS) \ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \ - $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) + $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) \ -+ $(GPG_ERROR_LIBS) - if !USE_LDAPWRAPPER ++ $(GPG_ERROR_LIBS) + if USE_LDAP dirmngr_LDADD += $(ldaplibs) endif -- cgit v1.2.3-54-g00ecf