blob: 4f5cedaca2bed6d353cbce557297e4a05984cb7f [file] [log] [blame]
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08001From 45d828356efc140a1492befb1e6dc59a9f4e16b5 Mon Sep 17 00:00:00 2001
Brad Bishop316dfdd2018-06-25 12:45:53 -04002From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 31 Jan 2018 10:44: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 Bishop316dfdd2018-06-25 12:45:53 -040014Rework to 1.10.0
Brad Bishopd7bf8c12018-02-25 22:55:05 -050015
16Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
17---
Brad Bishop316dfdd2018-06-25 12:45:53 -040018 lang/python/setup.py.in | 10 +---------
19 1 file changed, 1 insertion(+), 9 deletions(-)
Brad Bishopd7bf8c12018-02-25 22:55:05 -050020
21diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080022index 2595073..60b5257 100755
Brad Bishopd7bf8c12018-02-25 22:55:05 -050023--- a/lang/python/setup.py.in
24+++ b/lang/python/setup.py.in
Brad Bishop316dfdd2018-06-25 12:45:53 -040025@@ -26,7 +26,6 @@ import shutil
Brad Bishopd7bf8c12018-02-25 22:55:05 -050026 import subprocess
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 = ""
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080033@@ -157,14 +156,7 @@ class BuildExtFirstHack(build):
Brad Bishopd7bf8c12018-02-25 22:55:05 -050034
Brad Bishop316dfdd2018-06-25 12:45:53 -040035 def _generate_errors_i(self):
36
37- try:
38- subprocess.check_call(gpg_error_config + ['--version'],
39- stdout=devnull)
40- except:
41- sys.exit("Could not find gpg-error-config. " +
42- "Please install the libgpg-error development package.")
Brad Bishopd7bf8c12018-02-25 22:55:05 -050043-
Brad Bishop316dfdd2018-06-25 12:45:53 -040044- gpg_error_content = self._read_header("gpg-error.h", getconfig("cflags", config=gpg_error_config))
45+ gpg_error_content = self._read_header("gpg-error.h", os.environ.get('CFLAGS').split())
Brad Bishopd7bf8c12018-02-25 22:55:05 -050046
Brad Bishop316dfdd2018-06-25 12:45:53 -040047 filter_re = re.compile(r'GPG_ERR_[^ ]* =')
48 rewrite_re = re.compile(r' *(.*) = .*')
Brad Bishopd7bf8c12018-02-25 22:55:05 -050049--
Brad Bishop1a4b7ee2018-12-16 17:11:34 -0800502.7.4
Brad Bishopd7bf8c12018-02-25 22:55:05 -050051