diff options
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.patch | 24 |
1 files changed, 10 insertions, 14 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 3e798efd06..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,7 +1,7 @@ | |||
1 | From 9c3858ffda6246bf9e1e6aeeb920532a56b19408 Mon Sep 17 00:00:00 2001 | 1 | From 6c75656b68cb6e38b039ae532bd39437cd6daec5 Mon Sep 17 00:00:00 2001 |
2 | From: Saul Wold <sgw@linux.intel.com> | 2 | From: Saul Wold <sgw@linux.intel.com> |
3 | Date: Wed, 16 Aug 2017 11:18:01 +0800 | 3 | Date: Wed, 16 Aug 2017 11:18:01 +0800 |
4 | Subject: [PATCH 3/4] dirmngr uses libgpg error | 4 | Subject: [PATCH] dirmngr uses libgpg error |
5 | 5 | ||
6 | Upstream-Status: Pending | 6 | Upstream-Status: Pending |
7 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | 7 | Signed-off-by: Saul Wold <sgw@linux.intel.com> |
@@ -9,24 +9,20 @@ Signed-off-by: Saul Wold <sgw@linux.intel.com> | |||
9 | Rebase to 2.1.23 | 9 | Rebase to 2.1.23 |
10 | 10 | ||
11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
12 | |||
12 | --- | 13 | --- |
13 | dirmngr/Makefile.am | 3 ++- | 14 | dirmngr/Makefile.am | 1 + |
14 | 1 file changed, 2 insertions(+), 1 deletion(-) | 15 | 1 file changed, 1 insertion(+) |
15 | 16 | ||
16 | diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am | 17 | diff --git a/dirmngr/Makefile.am b/dirmngr/Makefile.am |
17 | index b404165..d3f916e 100644 | 18 | index 00d3c42..450d873 100644 |
18 | --- a/dirmngr/Makefile.am | 19 | --- a/dirmngr/Makefile.am |
19 | +++ b/dirmngr/Makefile.am | 20 | +++ b/dirmngr/Makefile.am |
20 | @@ -82,7 +82,8 @@ endif | 21 | @@ -101,6 +101,7 @@ dirmngr_LDADD = $(libcommonpth) \ |
21 | dirmngr_LDADD = $(libcommonpth) \ | ||
22 | $(DNSLIBS) $(LIBASSUAN_LIBS) \ | 22 | $(DNSLIBS) $(LIBASSUAN_LIBS) \ |
23 | $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \ | 23 | $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(NPTH_LIBS) \ |
24 | - $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) | 24 | $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) $(NETLIBS) \ |
25 | + $(NTBTLS_LIBS) $(LIBGNUTLS_LIBS) $(LIBINTL) $(LIBICONV) \ | 25 | + $(GPG_ERROR_LIBS) \ |
26 | + $(GPG_ERROR_LIBS) | 26 | $(dirmngr_robj) |
27 | if USE_LDAP | 27 | if USE_LDAP |
28 | dirmngr_LDADD += $(ldaplibs) | 28 | dirmngr_LDADD += $(ldaplibs) |
29 | endif | ||
30 | -- | ||
31 | 1.8.3.1 | ||
32 | |||