blob: ecd1793ab9c8b942c02e09f341f77af1cacb4fa8 [file] [log] [blame]
Brad Bishopc342db32019-05-15 21:57:59 -04001From 52f8fd2010b900c7d382a7c4e6c1a317d8160585 Mon Sep 17 00:00:00 2001
Brad Bishop316dfdd2018-06-25 12:45:53 -04002From: Hongxu Jia <hongxu.jia@windriver.com>
Brad Bishopc342db32019-05-15 21:57:59 -04003Date: Fri, 10 May 2019 14:30:36 +0800
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08004Subject: [PATCH 2/7] gpgme/lang/python: gpg-error-config should not be used
Brad Bishopd7bf8c12018-02-25 22:55:05 -05005
Brad Bishop316dfdd2018-06-25 12:45:53 -04006gpg-error-config was modified by OE to always return an error.
7So we want to find an alternative way to retrieve whatever it
8is we need.
Brad Bishopd7bf8c12018-02-25 22:55:05 -05009
10Upstream-Status: Inappropriate [changes are specific to OE]
11
12Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
13
Brad Bishopc342db32019-05-15 21:57:59 -040014Rebase to 1.13.0
Brad Bishopd7bf8c12018-02-25 22:55:05 -050015
16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
17---
Brad Bishopc342db32019-05-15 21:57:59 -040018 lang/python/setup.py.in | 9 +--------
19 1 file changed, 1 insertion(+), 8 deletions(-)
Brad Bishopd7bf8c12018-02-25 22:55:05 -050020
21diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
Brad Bishopc342db32019-05-15 21:57:59 -040022index 9785a28..006216d 100755
Brad Bishopd7bf8c12018-02-25 22:55:05 -050023--- a/lang/python/setup.py.in
24+++ b/lang/python/setup.py.in
Brad Bishop19323692019-04-05 15:28:33 -040025@@ -30,7 +30,6 @@ import subprocess
26 import sys
Brad Bishopd7bf8c12018-02-25 22:55:05 -050027
28 # Out-of-tree build of the gpg bindings.
Brad Bishopc342db32019-05-15 21:57:59 -040029-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):
Brad Bishopd7bf8c12018-02-25 22:55:05 -050034
Brad Bishop316dfdd2018-06-25 12:45:53 -040035 def _generate_errors_i(self):
Brad Bishopc342db32019-05-15 21:57:59 -040036
Brad Bishop316dfdd2018-06-25 12:45:53 -040037- try:
Brad Bishop19323692019-04-05 15:28:33 -040038- subprocess.check_call(
39- gpg_error_config + ['--version'], stdout=devnull)
Brad Bishop316dfdd2018-06-25 12:45:53 -040040- except:
Brad Bishopc342db32019-05-15 21:57:59 -040041- sys.exit('Could not find gpg-error-config. ' +
42- 'Please install the libgpg-error development package.')
43
Brad Bishop19323692019-04-05 15:28:33 -040044 gpg_error_content = self._read_header(
Brad Bishopc342db32019-05-15 21:57:59 -040045- 'gpg-error.h', getconfig('cflags', config=gpg_error_config))
Brad Bishop19323692019-04-05 15:28:33 -040046+ "gpg-error.h", os.environ.get('CFLAGS').split())
Brad Bishopd7bf8c12018-02-25 22:55:05 -050047
Brad Bishop316dfdd2018-06-25 12:45:53 -040048 filter_re = re.compile(r'GPG_ERR_[^ ]* =')
49 rewrite_re = re.compile(r' *(.*) = .*')
Brad Bishopd7bf8c12018-02-25 22:55:05 -050050--
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800512.7.4
Brad Bishopd7bf8c12018-02-25 22:55:05 -050052