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 | 66 |
1 files changed, 26 insertions, 40 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 f1f8c911fc..d20271e311 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,29 +1,28 @@ -From fb165c9bd96aca8c9ee3e4509c9b6e35d238ad2e Mon Sep 17 00:00:00 2001 -From: Mark Hatle <mark.hatle@windriver.com> -Date: Wed, 16 Aug 2017 02:02:47 -0400 -Subject: [PATCH 2/5] gpgme/lang/python: gpg-error-config should not be used. +From 30f7a694cc4568ecb24f77c83a6123ed3f4075fa Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Wed, 31 Jan 2018 10:44:19 +0800 +Subject: [PATCH] gpgme/lang/python: gpg-error-config should not be used -gpg-error-config was modified by OE to always return an error. So we want -to find an alternative way to retrieve whatever it is we need. It turns -out that the system is just trying to find the path to the gpg-error.h, which -we can pull in from the STAGING_INC environment. +gpg-error-config was modified by OE to always return an error. +So we want to find an alternative way to retrieve whatever it +is we need. Upstream-Status: Inappropriate [changes are specific to OE] Signed-off-by: Mark Hatle <mark.hatle@windriver.com> -Rebase to 1.9.0 +Rework to 1.10.0 Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - lang/python/setup.py.in | 15 ++------------- - 1 file changed, 2 insertions(+), 13 deletions(-) + lang/python/setup.py.in | 10 +--------- + 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in -index bf4efa3..7c34487 100755 +index f9dda20..9f5d61f 100755 --- a/lang/python/setup.py.in +++ b/lang/python/setup.py.in -@@ -24,7 +24,6 @@ import glob +@@ -26,7 +26,6 @@ import shutil import subprocess # Out-of-tree build of the gpg bindings. @@ -31,35 +30,22 @@ index bf4efa3..7c34487 100755 gpgme_config_flags = ["--thread=pthread"] gpgme_config = ["gpgme-config"] + gpgme_config_flags gpgme_h = "" -@@ -52,13 +51,6 @@ else: - devnull = open(os.devnull, "w") +@@ -174,14 +173,7 @@ class BuildExtFirstHack(build): - try: -- subprocess.check_call(gpg_error_config + ['--version'], -- stdout=devnull) --except: -- sys.exit("Could not find gpg-error-config. " + -- "Please install the libgpg-error development package.") -- --try: - subprocess.check_call(gpgme_config + ['--version'], - stdout=devnull) - except: -@@ -81,12 +73,9 @@ if not (major > 1 or (major == 1 and minor >= 7)): - if not gpgme_h: - gpgme_h = os.path.join(getconfig("prefix")[0], "include", "gpgme.h") - --gpg_error_prefix = getconfig("prefix", config=gpg_error_config)[0] --gpg_error_h = os.path.join(gpg_error_prefix, "include", "gpg-error.h") -+gpg_error_h = os.path.join(os.getenv('STAGING_INCDIR'), "gpg-error.h") - if not os.path.exists(gpg_error_h): -- gpg_error_h = \ -- glob.glob(os.path.join(gpg_error_prefix, "include", -- "*", "gpg-error.h"))[0] -+ sys.exit("gpg_error_h not found: %s" % gpg_error_h) + def _generate_errors_i(self): - print("Building python gpg module using {} and {}.".format(gpgme_h, gpg_error_h)) +- try: +- subprocess.check_call(gpg_error_config + ['--version'], +- stdout=devnull) +- except: +- sys.exit("Could not find gpg-error-config. " + +- "Please install the libgpg-error development package.") +- +- gpg_error_content = self._read_header("gpg-error.h", getconfig("cflags", config=gpg_error_config)) ++ gpg_error_content = self._read_header("gpg-error.h", os.environ.get('CFLAGS').split()) + filter_re = re.compile(r'GPG_ERR_[^ ]* =') + rewrite_re = re.compile(r' *(.*) = .*') -- -2.8.1 +1.8.3.1 |