summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch')
-rw-r--r--meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch18
1 files changed, 8 insertions, 10 deletions
diff --git a/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch b/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch
index 607a09f188..a13b4d5fb5 100644
--- a/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch
+++ b/meta/recipes-support/gnupg/gnupg/0003-dirmngr-uses-libgpg-error.patch
@@ -1,4 +1,4 @@
1From 9a901dbb1c48685f2db6d7b55916c9484e871f16 Mon Sep 17 00:00:00 2001 1From 6c75656b68cb6e38b039ae532bd39437cd6daec5 Mon Sep 17 00:00:00 2001
2From: Saul Wold <sgw@linux.intel.com> 2From: Saul Wold <sgw@linux.intel.com>
3Date: Wed, 16 Aug 2017 11:18:01 +0800 3Date: Wed, 16 Aug 2017 11:18:01 +0800
4Subject: [PATCH] dirmngr uses libgpg error 4Subject: [PATCH] dirmngr uses libgpg error
@@ -11,20 +11,18 @@ Rebase to 2.1.23
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12 12
13--- 13---
14 dirmngr/Makefile.am | 3 ++- 14 dirmngr/Makefile.am | 1 +
15 1 file changed, 2 insertions(+), 1 deletion(-) 15 1 file changed, 1 insertion(+)
16 16
17diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am 17diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am
18index 208a813..292c036 100644 18index 00d3c42..450d873 100644
19--- a/dirmngr/Makefile.am 19--- a/dirmngr/Makefile.am
20+++ b/dirmngr/Makefile.am 20+++ b/dirmngr/Makefile.am
21@@ -90,7 +90,8 @@ endif 21@@ -101,6 +101,7 @@ dirmngr_LDADD = $(libcommonpth) \
22 dirmngr_LDADD = $(libcommonpth) \
23 $(DNSLIBS) $(LIBASSUAN_LIBS) \ 22 $(DNSLIBS) $(LIBASSUAN_LIBS) \
24 $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \ 23 $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \
25- $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) 24 $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) \
26+ $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) \ 25+ $(GPG_ERROR_LIBS) \
27+ $(GPG_ERROR_LIBS) 26 $(dirmngr_robj)
28 if USE_LDAP 27 if USE_LDAP
29 dirmngr_LDADD += $(ldaplibs) 28 dirmngr_LDADD += $(ldaplibs)
30 endif