diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2017-08-16 04:31:21 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-18 10:40:27 +0100 |
commit | 26fbd1e3f67fb093b8eada5271e4412b78465977 (patch) | |
tree | ee6c6fc655e943e39f59aa541c33d79c589de6ef /meta/recipes-support/gpgme/gpgme/0004-python-import.patch | |
parent | 63042b82b2d611a8054af78ebe29d1ebdfc6228b (diff) | |
download | poky-26fbd1e3f67fb093b8eada5271e4412b78465977.tar.gz |
gpgme: 1.8.0 -> 1.9.0
Rebase patches:
- pkgconfig.patch -> 0001
- python-lang-config.patch -> 0002
- 0001-Correctly-install-python-modules.patch -> 0003
- python-import.patch -> 0004
- 0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch -> 0005
(From OE-Core rev: b18a7adf8ce194b2dd3ce787228fb87c5ef3efde)
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/0004-python-import.patch')
-rw-r--r-- | meta/recipes-support/gpgme/gpgme/0004-python-import.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0004-python-import.patch b/meta/recipes-support/gpgme/gpgme/0004-python-import.patch new file mode 100644 index 0000000000..93071030f9 --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme/0004-python-import.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | From ccbf028eea8815d3b16d6c34b527253a6b108ec3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@intel.com> | ||
3 | Date: Wed, 16 Aug 2017 02:06:45 -0400 | ||
4 | Subject: [PATCH 4/5] python import | ||
5 | |||
6 | Don't check for output on stderr to know if an import worked, host inputrc and | ||
7 | sysroot readline can cause warnings on stderr. | ||
8 | |||
9 | Upstream-Status: Backport (from autoconf-archive 883a2abd) | ||
10 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
11 | |||
12 | Rebase to 1.9.0 | ||
13 | |||
14 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | ||
15 | --- | ||
16 | m4/ax_python_devel.m4 | 2 +- | ||
17 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
18 | |||
19 | diff --git a/m4/ax_python_devel.m4 b/m4/ax_python_devel.m4 | ||
20 | index b990d5b..318b089 100644 | ||
21 | --- a/m4/ax_python_devel.m4 | ||
22 | +++ b/m4/ax_python_devel.m4 | ||
23 | @@ -137,7 +137,7 @@ variable to configure. See ``configure --help'' for reference. | ||
24 | # | ||
25 | AC_MSG_CHECKING([for the distutils Python package]) | ||
26 | ac_distutils_result=`$PYTHON -c "import distutils" 2>&1` | ||
27 | - if test -z "$ac_distutils_result"; then | ||
28 | + if test $? -eq 0; then | ||
29 | AC_MSG_RESULT([yes]) | ||
30 | else | ||
31 | AC_MSG_RESULT([no]) | ||
32 | -- | ||
33 | 2.8.1 | ||
34 | |||