diff options
author | Mark Hatle <mark.hatle@windriver.com> | 2017-03-07 12:54:33 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-03-07 21:46:52 +0000 |
commit | 839d6f124c2761194c868cf5597e1aa96571e1ca (patch) | |
tree | fa8707bf3e247c63bfe2a507c00d99873080a937 /meta/recipes-support/gpgme/gpgme | |
parent | 1098bcbc4520874967e7bd23fe798ab1a123fac4 (diff) | |
download | openembedded-core-contrib-839d6f124c2761194c868cf5597e1aa96571e1ca.tar.gz |
gpgme: Fix issue building for the target
gpgme failed when configuring since you can only configure for one python
system at a time (via the inherits). So we need to have a PACKAGECONFIG
that defines which one [or neither] you want to use.
The prior pkgconfig patch introduced the usage of the variable PKG_CONFIG,
which is not defined anywhere. Define this.
When building the python module, we can not call gpg-error-config, so we
need to find an alternative way of finding the information the setup.py.in
requires. (In this case, it's easy to just use the environment
STAGING_INCDIR.)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gpgme/gpgme')
-rw-r--r-- | meta/recipes-support/gpgme/gpgme/python-lang-config.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/python-lang-config.patch b/meta/recipes-support/gpgme/gpgme/python-lang-config.patch new file mode 100644 index 0000000000..132e42677f --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme/python-lang-config.patch @@ -0,0 +1,52 @@ +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. + +Upstream-Status: Inappropriate [changes are specific to OE] + +Signed-off-by: Mark Hatle <mark.hatle@windriver.com> + +Index: gpgme-1.8.0/lang/python/setup.py.in +=================================================================== +--- gpgme-1.8.0.orig/lang/python/setup.py.in ++++ gpgme-1.8.0/lang/python/setup.py.in +@@ -24,7 +24,6 @@ import glob + import subprocess + + # Out-of-tree build of the gpg bindings. +-gpg_error_config = ["gpg-error-config"] + gpgme_config_flags = ["--thread=pthread"] + gpgme_config = ["gpgme-config"] + gpgme_config_flags + gpgme_h = "" +@@ -52,13 +51,6 @@ else: + devnull = open(os.devnull, "w") + + 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 min + 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) + + print("Building python gpg module using {} and {}.".format(gpgme_h, gpg_error_h)) + |