diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2019-05-12 16:16:26 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-12 17:55:11 +0100 |
commit | 0ac1bb797a0793f8835f4da64c361dcb820f2ee1 (patch) | |
tree | 3cf6592cb42dd59a8c0751fca7403ca47116e581 /meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch | |
parent | 91227184b59df30222e45abf2edf13e4e65164a1 (diff) | |
download | poky-0ac1bb797a0793f8835f4da64c361dcb820f2ee1.tar.gz |
gpgme: upgrade 1.12.0 -> 1.13.0
- Revert gpgrt-config support which oe-core does not support it
- Rebase 0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch
and 0001-pkgconfig.patch
- Tweak LANGUAGES, since upstream auto check the version of python rather
than specify option
[ff6ff61 python: Auto-check for all installed python versions.]
License-update: SPDX identifiers site and formats
[8d91c0f Add SPDX identifiers to most source files]
"s/LGPL-2.1+/LGPL-2.1-or-later/"
"s#https://www.gnu.org/licenses#https://gnu.org/licenses#"
(From OE-Core rev: 991d374edd6fc66400dad0c54f007bfaaa46e47a)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch')
-rw-r--r-- | meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch b/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch new file mode 100644 index 0000000000..3afbfc8638 --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | From fc3d9cc218e60582fd158d21a1cd537a3dc1b007 Mon Sep 17 00:00:00 2001 | ||
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | ||
3 | Date: Fri, 10 May 2019 16:19:54 +0800 | ||
4 | Subject: [PATCH] do not auto check var-PYTHON | ||
5 | |||
6 | Upstream auto check the version of python rather than specify option | ||
7 | [ff6ff61 python: Auto-check for all installed python versions.] | ||
8 | |||
9 | In oe-core, don't check var-PYTHON, use the setting from recipe, | ||
10 | only check specific python 2.7 and 3.7 | ||
11 | |||
12 | Upstream-Status: Inappropriate [oe-core specific] | ||
13 | |||
14 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
15 | --- | ||
16 | configure.ac | 4 ++-- | ||
17 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
18 | |||
19 | diff --git a/configure.ac b/configure.ac | ||
20 | index cb2f073..7d74a6d 100644 | ||
21 | --- a/configure.ac | ||
22 | +++ b/configure.ac | ||
23 | @@ -423,8 +423,8 @@ if test "$found_py" = "1"; then | ||
24 | if test "$found_py" = "1" -o "$found_py3" = "1"; then | ||
25 | # Reset everything, so that we can look for another Python. | ||
26 | m4_foreach([mym4pythonver], | ||
27 | - [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[all]], | ||
28 | - [unset PYTHON | ||
29 | + [[2.7],[3.7]], | ||
30 | + [ | ||
31 | unset PYTHON_VERSION | ||
32 | unset PYTHON_CPPFLAGS | ||
33 | unset PYTHON_LDFLAGS | ||
34 | -- | ||
35 | 2.7.4 | ||
36 | |||