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 | 33 |
1 files changed, 16 insertions, 17 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 0d0d0c67b5..ecd1793ab9 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,6 +1,6 @@ | |||
1 | From 03819ad1270a279223219c0e70ba631bfe517714 Mon Sep 17 00:00:00 2001 | 1 | From 52f8fd2010b900c7d382a7c4e6c1a317d8160585 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: Wed, 17 Oct 2018 23:32:19 +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 2/7] 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. |
@@ -11,39 +11,38 @@ Upstream-Status: Inappropriate [changes are specific to OE] | |||
11 | 11 | ||
12 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 12 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
13 | 13 | ||
14 | Rebase to 1.12.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 | lang/python/setup.py.in | 11 +---------- | 18 | lang/python/setup.py.in | 9 +-------- |
19 | 1 file changed, 1 insertion(+), 10 deletions(-) | 19 | 1 file changed, 1 insertion(+), 8 deletions(-) |
20 | 20 | ||
21 | diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in | 21 | diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in |
22 | index 65a4be0..11b8413 100755 | 22 | index 9785a28..006216d 100755 |
23 | --- a/lang/python/setup.py.in | 23 | --- a/lang/python/setup.py.in |
24 | +++ b/lang/python/setup.py.in | 24 | +++ b/lang/python/setup.py.in |
25 | @@ -30,7 +30,6 @@ import subprocess | 25 | @@ -30,7 +30,6 @@ import subprocess |
26 | import sys | 26 | import sys |
27 | 27 | ||
28 | # Out-of-tree build of the gpg bindings. | 28 | # Out-of-tree build of the gpg bindings. |
29 | -gpg_error_config = ["gpg-error-config"] | 29 | -gpg_error_config = ['gpg-error-config'] |
30 | gpgme_config_flags = ["--thread=pthread"] | 30 | gpgme_config_flags = ['--thread=pthread'] |
31 | gpgme_config = ["gpgme-config"] + gpgme_config_flags | 31 | gpgme_config = ['gpgme-config'] + gpgme_config_flags |
32 | gpgme_h = "" | 32 | gpgme_h = '' |
33 | @@ -181,16 +180,8 @@ class BuildExtFirstHack(build): | 33 | @@ -182,15 +181,9 @@ class BuildExtFirstHack(build): |
34 | shutil.copy2(source_name, sink_name) | ||
35 | 34 | ||
36 | def _generate_errors_i(self): | 35 | def _generate_errors_i(self): |
37 | - | 36 | |
38 | - try: | 37 | - try: |
39 | - subprocess.check_call( | 38 | - subprocess.check_call( |
40 | - gpg_error_config + ['--version'], stdout=devnull) | 39 | - gpg_error_config + ['--version'], stdout=devnull) |
41 | - except: | 40 | - except: |
42 | - sys.exit("Could not find gpg-error-config. " + | 41 | - sys.exit('Could not find gpg-error-config. ' + |
43 | - "Please install the libgpg-error development package.") | 42 | - 'Please install the libgpg-error development package.') |
44 | - | 43 | |
45 | gpg_error_content = self._read_header( | 44 | gpg_error_content = self._read_header( |
46 | - "gpg-error.h", getconfig("cflags", config=gpg_error_config)) | 45 | - 'gpg-error.h', getconfig('cflags', config=gpg_error_config)) |
47 | + "gpg-error.h", os.environ.get('CFLAGS').split()) | 46 | + "gpg-error.h", os.environ.get('CFLAGS').split()) |
48 | 47 | ||
49 | filter_re = re.compile(r'GPG_ERR_[^ ]* =') | 48 | filter_re = re.compile(r'GPG_ERR_[^ ]* =') |