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 14:17:51 +0100 |
| commit | 991d374edd6fc66400dad0c54f007bfaaa46e47a (patch) | |
| tree | 8cafe7e4aa59e2267fba65e360b5a878dfe943f2 /meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch | |
| parent | 50c872f402656e192d47b7a64e003f345227e55c (diff) | |
| download | openembedded-core-contrib-991d374edd6fc66400dad0c54f007bfaaa46e47a.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#"
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 @@ +From fc3d9cc218e60582fd158d21a1cd537a3dc1b007 Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Fri, 10 May 2019 16:19:54 +0800 +Subject: [PATCH] do not auto check var-PYTHON + +Upstream auto check the version of python rather than specify option +[ff6ff61 python: Auto-check for all installed python versions.] + +In oe-core, don't check var-PYTHON, use the setting from recipe, +only check specific python 2.7 and 3.7 + +Upstream-Status: Inappropriate [oe-core specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index cb2f073..7d74a6d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -423,8 +423,8 @@ if test "$found_py" = "1"; then + if test "$found_py" = "1" -o "$found_py3" = "1"; then + # Reset everything, so that we can look for another Python. + m4_foreach([mym4pythonver], +- [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[all]], +- [unset PYTHON ++ [[2.7],[3.7]], ++ [ + unset PYTHON_VERSION + unset PYTHON_CPPFLAGS + unset PYTHON_LDFLAGS +-- +2.7.4 + |