diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-02-01 01:17:10 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-06 11:06:28 +0000 |
commit | 7f6b919759902df4d2665e0d72671b53988c5f0a (patch) | |
tree | f31b4eb074cc6463ba92d9b449f392c6afb78c5d /meta/recipes-support/gpgme/gpgme/0002-gpgme-lang-python-gpg-error-config-should-not-be-use.patch | |
parent | 5a74a370ed29821cca2788cc9a7df440a93e916e (diff) | |
download | poky-7f6b919759902df4d2665e0d72671b53988c5f0a.tar.gz |
gpgme: 1.9.0 -> 1.10.0
1. Disable test at build time to workaround corss-compile
Add 0007 to add option to disable python test and submit
it to upstream
2. Rework patch 0002, since the following commit of upstream.
https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commit;h=7309ce6f5f7c86570953a141965d4f54cd9ad9a0
3. Add patch 0006 to fix build path issue to improve reproducibility
and submit it to upstream
(From OE-Core rev: 80d2e065bb3e2ce7d7f8a956c3fecd26eb582b62)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 @@ | |||
1 | From fb165c9bd96aca8c9ee3e4509c9b6e35d238ad2e Mon Sep 17 00:00:00 2001 | 1 | From 30f7a694cc4568ecb24f77c83a6123ed3f4075fa Mon Sep 17 00:00:00 2001 |
2 | From: Mark Hatle <mark.hatle@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Wed, 16 Aug 2017 02:02:47 -0400 | 3 | Date: Wed, 31 Jan 2018 10:44:19 +0800 |
4 | Subject: [PATCH 2/5] gpgme/lang/python: gpg-error-config should not be used. | 4 | Subject: [PATCH] gpgme/lang/python: gpg-error-config should not be used |
5 | 5 | ||
6 | gpg-error-config was modified by OE to always return an error. So we want | 6 | gpg-error-config was modified by OE to always return an error. |
7 | to find an alternative way to retrieve whatever it is we need. It turns | 7 | So we want to find an alternative way to retrieve whatever it |
8 | out that the system is just trying to find the path to the gpg-error.h, which | 8 | is we need. |
9 | we can pull in from the STAGING_INC environment. | ||
10 | 9 | ||
11 | Upstream-Status: Inappropriate [changes are specific to OE] | 10 | Upstream-Status: Inappropriate [changes are specific to OE] |
12 | 11 | ||
13 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> | 12 | Signed-off-by: Mark Hatle <mark.hatle@windriver.com> |
14 | 13 | ||
15 | Rebase to 1.9.0 | 14 | Rework to 1.10.0 |
16 | 15 | ||
17 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 16 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
18 | --- | 17 | --- |
19 | lang/python/setup.py.in | 15 ++------------- | 18 | lang/python/setup.py.in | 10 +--------- |
20 | 1 file changed, 2 insertions(+), 13 deletions(-) | 19 | 1 file changed, 1 insertion(+), 9 deletions(-) |
21 | 20 | ||
22 | diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in | 21 | diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in |
23 | index bf4efa3..7c34487 100755 | 22 | index f9dda20..9f5d61f 100755 |
24 | --- a/lang/python/setup.py.in | 23 | --- a/lang/python/setup.py.in |
25 | +++ b/lang/python/setup.py.in | 24 | +++ b/lang/python/setup.py.in |
26 | @@ -24,7 +24,6 @@ import glob | 25 | @@ -26,7 +26,6 @@ import shutil |
27 | import subprocess | 26 | import subprocess |
28 | 27 | ||
29 | # Out-of-tree build of the gpg bindings. | 28 | # Out-of-tree build of the gpg bindings. |
@@ -31,35 +30,22 @@ index bf4efa3..7c34487 100755 | |||
31 | gpgme_config_flags = ["--thread=pthread"] | 30 | gpgme_config_flags = ["--thread=pthread"] |
32 | gpgme_config = ["gpgme-config"] + gpgme_config_flags | 31 | gpgme_config = ["gpgme-config"] + gpgme_config_flags |
33 | gpgme_h = "" | 32 | gpgme_h = "" |
34 | @@ -52,13 +51,6 @@ else: | 33 | @@ -174,14 +173,7 @@ class BuildExtFirstHack(build): |
35 | devnull = open(os.devnull, "w") | ||
36 | 34 | ||
37 | try: | 35 | def _generate_errors_i(self): |
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.") | ||
43 | - | ||
44 | -try: | ||
45 | subprocess.check_call(gpgme_config + ['--version'], | ||
46 | stdout=devnull) | ||
47 | except: | ||
48 | @@ -81,12 +73,9 @@ if not (major > 1 or (major == 1 and minor >= 7)): | ||
49 | if not gpgme_h: | ||
50 | gpgme_h = os.path.join(getconfig("prefix")[0], "include", "gpgme.h") | ||
51 | |||
52 | -gpg_error_prefix = getconfig("prefix", config=gpg_error_config)[0] | ||
53 | -gpg_error_h = os.path.join(gpg_error_prefix, "include", "gpg-error.h") | ||
54 | +gpg_error_h = os.path.join(os.getenv('STAGING_INCDIR'), "gpg-error.h") | ||
55 | if not os.path.exists(gpg_error_h): | ||
56 | - gpg_error_h = \ | ||
57 | - glob.glob(os.path.join(gpg_error_prefix, "include", | ||
58 | - "*", "gpg-error.h"))[0] | ||
59 | + sys.exit("gpg_error_h not found: %s" % gpg_error_h) | ||
60 | 36 | ||
61 | print("Building python gpg module using {} and {}.".format(gpgme_h, gpg_error_h)) | 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.") | ||
43 | - | ||
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()) | ||
62 | 46 | ||
47 | filter_re = re.compile(r'GPG_ERR_[^ ]* =') | ||
48 | rewrite_re = re.compile(r' *(.*) = .*') | ||
63 | -- | 49 | -- |
64 | 2.8.1 | 50 | 1.8.3.1 |
65 | 51 | ||