diff options
Diffstat (limited to 'meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch')
-rw-r--r-- | meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch | 34 |
1 files changed, 9 insertions, 25 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch b/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch index ecd1793ab9..0d2692912f 100644 --- a/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch +++ b/meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch | |||
@@ -1,7 +1,7 @@ | |||
1 | From 52f8fd2010b900c7d382a7c4e6c1a317d8160585 Mon Sep 17 00:00:00 2001 | 1 | From 9fce0689bc04506e5758444efa24ea99fe1ff5ef 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 14:30:36 +0800 | 3 | Date: Fri, 10 May 2019 14:30:36 +0800 |
4 | Subject: [PATCH 2/7] gpgme/lang/python: gpg-error-config should not be used | 4 | Subject: [PATCH] gpgme/lang/python: gpg-error-config should not be used |
5 | 5 | ||
6 | gpg-error-config was modified by OE to always return an error. | 6 | gpg-error-config was modified by OE to always return an error. |
7 | So we want to find an alternative way to retrieve whatever it | 7 | So we want to find an alternative way to retrieve whatever it |
@@ -14,39 +14,23 @@ Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | |||
14 | Rebase to 1.13.0 | 14 | Rebase to 1.13.0 |
15 | 15 | ||
16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
17 | |||
17 | --- | 18 | --- |
18 | lang/python/setup.py.in | 9 +-------- | 19 | lang/python/setup.py.in | 3 +-- |
19 | 1 file changed, 1 insertion(+), 8 deletions(-) | 20 | 1 file changed, 1 insertion(+), 2 deletions(-) |
20 | 21 | ||
21 | diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in | 22 | diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in |
22 | index 9785a28..006216d 100755 | 23 | index 6f36861..1d9058b 100755 |
23 | --- a/lang/python/setup.py.in | 24 | --- a/lang/python/setup.py.in |
24 | +++ b/lang/python/setup.py.in | 25 | +++ b/lang/python/setup.py.in |
25 | @@ -30,7 +30,6 @@ import subprocess | 26 | @@ -169,9 +169,8 @@ class BuildExtFirstHack(build): |
26 | import sys | ||
27 | |||
28 | # Out-of-tree build of the gpg bindings. | ||
29 | -gpg_error_config = ['gpg-error-config'] | ||
30 | gpgme_config_flags = ['--thread=pthread'] | ||
31 | gpgme_config = ['gpgme-config'] + gpgme_config_flags | ||
32 | gpgme_h = '' | ||
33 | @@ -182,15 +181,9 @@ class BuildExtFirstHack(build): | ||
34 | 27 | ||
35 | def _generate_errors_i(self): | 28 | def _generate_errors_i(self): |
36 | 29 | ||
37 | - try: | 30 | - ge_cflags='@GPG_ERROR_CFLAGS@' |
38 | - subprocess.check_call( | ||
39 | - gpg_error_config + ['--version'], stdout=devnull) | ||
40 | - except: | ||
41 | - sys.exit('Could not find gpg-error-config. ' + | ||
42 | - 'Please install the libgpg-error development package.') | ||
43 | |||
44 | gpg_error_content = self._read_header( | 31 | gpg_error_content = self._read_header( |
45 | - 'gpg-error.h', getconfig('cflags', config=gpg_error_config)) | 32 | - 'gpg-error.h', ge_cflags.split(' ') if ge_cflags else []) |
46 | + "gpg-error.h", os.environ.get('CFLAGS').split()) | 33 | + "gpg-error.h", os.environ.get('CFLAGS').split()) |
47 | 34 | ||
48 | filter_re = re.compile(r'GPG_ERR_[^ ]* =') | 35 | filter_re = re.compile(r'GPG_ERR_[^ ]* =') |
49 | rewrite_re = re.compile(r' *(.*) = .*') | 36 | rewrite_re = re.compile(r' *(.*) = .*') |
50 | -- | ||
51 | 2.7.4 | ||
52 | |||