blob: 0d0d0c67b5750323ebb8e800b3c61d5d9291f67f [file] [log] [blame]
Brad Bishop19323692019-04-05 15:28:33 -04001From 03819ad1270a279223219c0e70ba631bfe517714 Mon Sep 17 00:00:00 2001
Brad Bishop316dfdd2018-06-25 12:45:53 -04002From: Hongxu Jia <hongxu.jia@windriver.com>
Brad Bishop19323692019-04-05 15:28:33 -04003Date: Wed, 17 Oct 2018 23:32:19 +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 Bishop19323692019-04-05 15:28:33 -040014Rebase to 1.12.0
Brad Bishopd7bf8c12018-02-25 22:55:05 -050015
16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
17---
Brad Bishop19323692019-04-05 15:28:33 -040018 lang/python/setup.py.in | 11 +----------
19 1 file changed, 1 insertion(+), 10 deletions(-)
Brad Bishopd7bf8c12018-02-25 22:55:05 -050020
21diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
Brad Bishop19323692019-04-05 15:28:33 -040022index 65a4be0..11b8413 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.
29-gpg_error_config = ["gpg-error-config"]
30 gpgme_config_flags = ["--thread=pthread"]
31 gpgme_config = ["gpgme-config"] + gpgme_config_flags
32 gpgme_h = ""
Brad Bishop19323692019-04-05 15:28:33 -040033@@ -181,16 +180,8 @@ class BuildExtFirstHack(build):
34 shutil.copy2(source_name, sink_name)
Brad Bishopd7bf8c12018-02-25 22:55:05 -050035
Brad Bishop316dfdd2018-06-25 12:45:53 -040036 def _generate_errors_i(self):
Brad Bishop19323692019-04-05 15:28:33 -040037-
Brad Bishop316dfdd2018-06-25 12:45:53 -040038- try:
Brad Bishop19323692019-04-05 15:28:33 -040039- subprocess.check_call(
40- gpg_error_config + ['--version'], stdout=devnull)
Brad Bishop316dfdd2018-06-25 12:45:53 -040041- except:
42- sys.exit("Could not find gpg-error-config. " +
43- "Please install the libgpg-error development package.")
Brad Bishopd7bf8c12018-02-25 22:55:05 -050044-
Brad Bishop19323692019-04-05 15:28:33 -040045 gpg_error_content = self._read_header(
46- "gpg-error.h", getconfig("cflags", config=gpg_error_config))
47+ "gpg-error.h", os.environ.get('CFLAGS').split())
Brad Bishopd7bf8c12018-02-25 22:55:05 -050048
Brad Bishop316dfdd2018-06-25 12:45:53 -040049 filter_re = re.compile(r'GPG_ERR_[^ ]* =')
50 rewrite_re = re.compile(r' *(.*) = .*')
Brad Bishopd7bf8c12018-02-25 22:55:05 -050051--
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800522.7.4
Brad Bishopd7bf8c12018-02-25 22:55:05 -050053