diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2020-08-23 22:20:26 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-25 16:00:11 +0100 |
commit | a395840f3a501a7fb3d22f3fe0c076fa5a7057e9 (patch) | |
tree | 615a721b0f8ad6dcbcfde5c222bf257571b3ff8b | |
parent | 065bc3ac0a5cb059052f1a7642095e705740b435 (diff) | |
download | poky-a395840f3a501a7fb3d22f3fe0c076fa5a7057e9.tar.gz |
gpgme: update 1.13.1 -> 1.14.0
(From OE-Core rev: c3ca89862b90a8e42eaa7e2e5acdf1d65a14a7bb)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-support/gpgme/gpgme/0008-do-not-auto-check-var-PYTHON.patch | 12 | ||||
-rw-r--r-- | meta/recipes-support/gpgme/gpgme_1.14.0.bb (renamed from meta/recipes-support/gpgme/gpgme_1.13.1.bb) | 3 |
2 files changed, 6 insertions, 9 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 index 3afbfc8638..dfea1bf78a 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From fc3d9cc218e60582fd158d21a1cd537a3dc1b007 Mon Sep 17 00:00:00 2001 | 1 | From 5bbf7a048b6d81d23186340e839f9f65b5b514b6 Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Fri, 10 May 2019 16:19:54 +0800 | 3 | Date: Fri, 10 May 2019 16:19:54 +0800 |
4 | Subject: [PATCH] do not auto check var-PYTHON | 4 | Subject: [PATCH] do not auto check var-PYTHON |
@@ -12,25 +12,23 @@ only check specific python 2.7 and 3.7 | |||
12 | Upstream-Status: Inappropriate [oe-core specific] | 12 | Upstream-Status: Inappropriate [oe-core specific] |
13 | 13 | ||
14 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 14 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
15 | |||
15 | --- | 16 | --- |
16 | configure.ac | 4 ++-- | 17 | configure.ac | 4 ++-- |
17 | 1 file changed, 2 insertions(+), 2 deletions(-) | 18 | 1 file changed, 2 insertions(+), 2 deletions(-) |
18 | 19 | ||
19 | diff --git a/configure.ac b/configure.ac | 20 | diff --git a/configure.ac b/configure.ac |
20 | index cb2f073..7d74a6d 100644 | 21 | index 5ef00c0..bbcff93 100644 |
21 | --- a/configure.ac | 22 | --- a/configure.ac |
22 | +++ b/configure.ac | 23 | +++ b/configure.ac |
23 | @@ -423,8 +423,8 @@ if test "$found_py" = "1"; then | 24 | @@ -425,8 +425,8 @@ if test "$found_py" = "1"; then |
24 | if test "$found_py" = "1" -o "$found_py3" = "1"; then | 25 | if test "$found_py" = "1" -o "$found_py3" = "1"; then |
25 | # Reset everything, so that we can look for another Python. | 26 | # Reset everything, so that we can look for another Python. |
26 | m4_foreach([mym4pythonver], | 27 | m4_foreach([mym4pythonver], |
27 | - [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[all]], | 28 | - [[2.7],[3.4],[3.5],[3.6],[3.7],[3.8],[3.9],[all]], |
28 | - [unset PYTHON | 29 | - [unset PYTHON |
29 | + [[2.7],[3.7]], | 30 | + [[2.7],[3.7]], |
30 | + [ | 31 | + [ |
31 | unset PYTHON_VERSION | 32 | unset PYTHON_VERSION |
32 | unset PYTHON_CPPFLAGS | 33 | unset PYTHON_CPPFLAGS |
33 | unset PYTHON_LDFLAGS | 34 | unset PYTHON_LDFLAGS |
34 | -- | ||
35 | 2.7.4 | ||
36 | |||
diff --git a/meta/recipes-support/gpgme/gpgme_1.13.1.bb b/meta/recipes-support/gpgme/gpgme_1.14.0.bb index b51534351d..9fa8212808 100644 --- a/meta/recipes-support/gpgme/gpgme_1.13.1.bb +++ b/meta/recipes-support/gpgme/gpgme_1.14.0.bb | |||
@@ -22,8 +22,7 @@ SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ | |||
22 | file://0008-do-not-auto-check-var-PYTHON.patch \ | 22 | file://0008-do-not-auto-check-var-PYTHON.patch \ |
23 | " | 23 | " |
24 | 24 | ||
25 | SRC_URI[md5sum] = "198f0a908ec3cd8f0ce9a4f3a4489645" | 25 | SRC_URI[sha256sum] = "cef1f710a6b0d28f5b44242713ad373702d1466dcbe512eb4e754d7f35cd4307" |
26 | SRC_URI[sha256sum] = "c4e30b227682374c23cddc7fdb9324a99694d907e79242a25a4deeedb393be46" | ||
27 | 26 | ||
28 | DEPENDS = "libgpg-error libassuan" | 27 | DEPENDS = "libgpg-error libassuan" |
29 | RDEPENDS_${PN}-cpp += "libstdc++" | 28 | RDEPENDS_${PN}-cpp += "libstdc++" |