summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-03-10 13:24:23 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-11 16:09:14 +0000
commit828fc447e5942532b17390f9d79a04772c4dd223 (patch)
treec7236c0c7b3a2f9ced44fdaddcba45d6a2d7523b
parentcd06d245259ef0afd6558ebf55201a02db27019a (diff)
downloadpoky-828fc447e5942532b17390f9d79a04772c4dd223.tar.gz
gpgme: fix python module build and installation
(From OE-Core rev: 317af6946d53a512a251e78f5ea3634759b65f1f) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-support/gpgme/gpgme/0001-Avoid-host-contamination-from-gpg-config.patch30
-rw-r--r--meta/recipes-support/gpgme/gpgme/0001-Correctly-install-python-modules.patch26
-rw-r--r--meta/recipes-support/gpgme/gpgme_1.8.0.bb2
3 files changed, 58 insertions, 0 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0001-Avoid-host-contamination-from-gpg-config.patch b/meta/recipes-support/gpgme/gpgme/0001-Avoid-host-contamination-from-gpg-config.patch
new file mode 100644
index 0000000000..6ce58ba3f6
--- /dev/null
+++ b/meta/recipes-support/gpgme/gpgme/0001-Avoid-host-contamination-from-gpg-config.patch
@@ -0,0 +1,30 @@
1From 96cfc76def123141d0cecaab857da3880396d5ef Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 9 Mar 2017 22:11:00 +0200
4Subject: [PATCH] Avoid host contamination from gpg-config
5
6getconfig is calling gpgme-config (from the source tree) and it
7gives -L{libdir} (i.e. -L/usr/lib) as the first item for linking.
8
9Upstream-Status: Inappropriate [oe-core specific]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 lang/python/setup.py.in | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
16index 213fe33..22629e2 100755
17--- a/lang/python/setup.py.in
18+++ b/lang/python/setup.py.in
19@@ -86,7 +86,7 @@ subprocess.check_call([sys.executable, "gpgme-h-clean.py", gpg_error_h],
20 stdout=open("errors.i", "w"))
21
22 define_macros = []
23-libs = getconfig('libs')
24+libs = getconfig('libs')[1:]
25
26 # Define extra_macros for both the SWIG and C code
27 for k, v in extra_macros.items():
28--
292.11.0
30
diff --git a/meta/recipes-support/gpgme/gpgme/0001-Correctly-install-python-modules.patch b/meta/recipes-support/gpgme/gpgme/0001-Correctly-install-python-modules.patch
new file mode 100644
index 0000000000..42655fbbe6
--- /dev/null
+++ b/meta/recipes-support/gpgme/gpgme/0001-Correctly-install-python-modules.patch
@@ -0,0 +1,26 @@
1From 4d714c097e497b63d2e8b22a834c671045e215e9 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 9 Mar 2017 21:34:55 +0200
4Subject: [PATCH] Correctly install python modules
5
6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 lang/python/Makefile.am | 1 +
10 1 file changed, 1 insertion(+)
11
12diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
13index e32fd12..5ecf6fb 100644
14--- a/lang/python/Makefile.am
15+++ b/lang/python/Makefile.am
16@@ -102,6 +102,7 @@ install-exec-local:
17 for PYTHON in $(PYTHONS); do \
18 $$PYTHON setup.py install \
19 --prefix $(DESTDIR)$(prefix) \
20+ --install-lib=$(DESTDIR)${pythondir} \
21 --record files.txt \
22 --verbose ; \
23 cat files.txt >> install_files.txt ; \
24--
252.11.0
26
diff --git a/meta/recipes-support/gpgme/gpgme_1.8.0.bb b/meta/recipes-support/gpgme/gpgme_1.8.0.bb
index 728e247a18..36a95417b2 100644
--- a/meta/recipes-support/gpgme/gpgme_1.8.0.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.8.0.bb
@@ -13,6 +13,8 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
13SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \ 13SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
14 file://pkgconfig.patch \ 14 file://pkgconfig.patch \
15 file://python-lang-config.patch \ 15 file://python-lang-config.patch \
16 file://0001-Correctly-install-python-modules.patch \
17 file://0001-Avoid-host-contamination-from-gpg-config.patch \
16 " 18 "
17 19
18SRC_URI[md5sum] = "722a4153904b9b5dc15485a22d29263b" 20SRC_URI[md5sum] = "722a4153904b9b5dc15485a22d29263b"