diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-02-01 01:17:10 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-06 11:06:28 +0000 |
commit | 7f6b919759902df4d2665e0d72671b53988c5f0a (patch) | |
tree | f31b4eb074cc6463ba92d9b449f392c6afb78c5d /meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch | |
parent | 5a74a370ed29821cca2788cc9a7df440a93e916e (diff) | |
download | poky-7f6b919759902df4d2665e0d72671b53988c5f0a.tar.gz |
gpgme: 1.9.0 -> 1.10.0
1. Disable test at build time to workaround corss-compile
Add 0007 to add option to disable python test and submit
it to upstream
2. Rework patch 0002, since the following commit of upstream.
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commit;h=7309ce6f5f7c86570953a141965d4f54cd9ad9a0
3. Add patch 0006 to fix build path issue to improve reproducibility
and submit it to upstream
(From OE-Core rev: 80d2e065bb3e2ce7d7f8a956c3fecd26eb582b62)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch')
-rw-r--r-- | meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch index 14a43eeeeb..f1997e15a3 100644 --- a/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch +++ b/meta/recipes-support/gpgme/gpgme/0001-pkgconfig.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 8ae149035c97d27cd2c624704d1651806c53577e Mon Sep 17 00:00:00 2001 | 1 | From 265faf8fe0acaca2043a248a4df02b0868ffa6de Mon Sep 17 00:00:00 2001 |
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
3 | Date: Wed, 16 Aug 2017 02:00:08 -0400 | 3 | Date: Wed, 16 Aug 2017 02:00:08 -0400 |
4 | Subject: [PATCH 1/5] pkgconfig | 4 | Subject: [PATCH 1/4] pkgconfig |
5 | 5 | ||
6 | Update gpgme to use pkgconfig instead of -config files since its | 6 | Update gpgme to use pkgconfig instead of -config files since its |
7 | simpler and less error prone when cross compiling. | 7 | simpler and less error prone when cross compiling. |
@@ -25,10 +25,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | |||
25 | create mode 100644 src/gpgme.pc.in | 25 | create mode 100644 src/gpgme.pc.in |
26 | 26 | ||
27 | diff --git a/configure.ac b/configure.ac | 27 | diff --git a/configure.ac b/configure.ac |
28 | index 0dac6ce..6a9e507 100644 | 28 | index 6ea4bcd..2a0d528 100644 |
29 | --- a/configure.ac | 29 | --- a/configure.ac |
30 | +++ b/configure.ac | 30 | +++ b/configure.ac |
31 | @@ -866,6 +866,7 @@ AC_CONFIG_FILES(Makefile src/Makefile | 31 | @@ -887,6 +887,7 @@ AC_CONFIG_FILES(Makefile src/Makefile |
32 | src/versioninfo.rc | 32 | src/versioninfo.rc |
33 | src/gpgme.h) | 33 | src/gpgme.h) |
34 | AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) | 34 | AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) |
@@ -299,5 +299,5 @@ index 0000000..b69539f | |||
299 | +Requires: libassuan gpg-error | 299 | +Requires: libassuan gpg-error |
300 | \ No newline at end of file | 300 | \ No newline at end of file |
301 | -- | 301 | -- |
302 | 2.8.1 | 302 | 1.8.3.1 |
303 | 303 | ||