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-08 11:52:56 +0000 |
commit | fc6c81da79897c95a9c81960a1dee49517f2562a (patch) | |
tree | 01a121cc4584e11ebdc1fd542428d3a4de93b492 /meta/recipes-support/gpgme/gpgme | |
parent | 07eca818019e1969c78afa8932f0e2cda1fc8e72 (diff) | |
download | poky-fc6c81da79897c95a9c81960a1dee49517f2562a.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.)
(From OE-Core rev: 839d6f124c2761194c868cf5597e1aa96571e1ca)
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 @@ | |||
1 | gpgme/lang/python: gpg-error-config should not be used. | ||
2 | |||
3 | gpg-error-config was modified by OE to always return an error. So we want | ||
4 | to find an alternative way to retrieve whatever it is we need. It turns | ||
5 | out that the system is just trying to find the path to the gpg-error.h, which | ||
6 | we can pull in from the STAGING_INC environment. | ||
7 | |||
8 | Upstream-Status: Inappropriate [changes are specific to OE] | ||
9 | |||
10 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | ||
11 | |||
12 | Index: gpgme-1.8.0/lang/python/setup.py.in | ||
13 | =================================================================== | ||
14 | --- gpgme-1.8.0.orig/lang/python/setup.py.in | ||
15 | +++ gpgme-1.8.0/lang/python/setup.py.in | ||
16 | @@ -24,7 +24,6 @@ import glob | ||
17 | import subprocess | ||
18 | |||
19 | # Out-of-tree build of the gpg bindings. | ||
20 | -gpg_error_config = ["gpg-error-config"] | ||
21 | gpgme_config_flags = ["--thread=pthread"] | ||
22 | gpgme_config = ["gpgme-config"] + gpgme_config_flags | ||
23 | gpgme_h = "" | ||
24 | @@ -52,13 +51,6 @@ else: | ||
25 | devnull = open(os.devnull, "w") | ||
26 | |||
27 | try: | ||
28 | - subprocess.check_call(gpg_error_config + ['--version'], | ||
29 | - stdout=devnull) | ||
30 | -except: | ||
31 | - sys.exit("Could not find gpg-error-config. " + | ||
32 | - "Please install the libgpg-error development package.") | ||
33 | - | ||
34 | -try: | ||
35 | subprocess.check_call(gpgme_config + ['--version'], | ||
36 | stdout=devnull) | ||
37 | except: | ||
38 | @@ -81,12 +73,9 @@ if not (major > 1 or (major == 1 and min | ||
39 | if not gpgme_h: | ||
40 | gpgme_h = os.path.join(getconfig("prefix")[0], "include", "gpgme.h") | ||
41 | |||
42 | -gpg_error_prefix = getconfig("prefix", config=gpg_error_config)[0] | ||
43 | -gpg_error_h = os.path.join(gpg_error_prefix, "include", "gpg-error.h") | ||
44 | +gpg_error_h = os.path.join(os.getenv('STAGING_INCDIR'), "gpg-error.h") | ||
45 | if not os.path.exists(gpg_error_h): | ||
46 | - gpg_error_h = \ | ||
47 | - glob.glob(os.path.join(gpg_error_prefix, "include", | ||
48 | - "*", "gpg-error.h"))[0] | ||
49 | + sys.exit("gpg_error_h not found: %s" % gpg_error_h) | ||
50 | |||
51 | print("Building python gpg module using {} and {}.".format(gpgme_h, gpg_error_h)) | ||
52 | |||