Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 45d828356efc140a1492befb1e6dc59a9f4e16b5 Mon Sep 17 00:00:00 2001 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Wed, 31 Jan 2018 10:44:19 +0800 |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 4 | Subject: [PATCH 2/7] gpgme/lang/python: gpg-error-config should not be used |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 5 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 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 |
| 8 | is we need. |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 9 | |
| 10 | Upstream-Status: Inappropriate [changes are specific to OE] |
| 11 | |
| 12 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
| 13 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 14 | Rework to 1.10.0 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 15 | |
| 16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 17 | --- |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 18 | lang/python/setup.py.in | 10 +--------- |
| 19 | 1 file changed, 1 insertion(+), 9 deletions(-) |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 20 | |
| 21 | diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 22 | index 2595073..60b5257 100755 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 23 | --- a/lang/python/setup.py.in |
| 24 | +++ b/lang/python/setup.py.in |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 25 | @@ -26,7 +26,6 @@ import shutil |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 26 | 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 Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 33 | @@ -157,14 +156,7 @@ class BuildExtFirstHack(build): |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 34 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 35 | 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 Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 43 | - |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 44 | - 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 Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 46 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 47 | filter_re = re.compile(r'GPG_ERR_[^ ]* =') |
| 48 | rewrite_re = re.compile(r' *(.*) = .*') |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 49 | -- |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 50 | 2.7.4 |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 51 | |