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>
This commit is contained in:
parent
cd06d24525
commit
828fc447e5
|
@ -0,0 +1,30 @@
|
|||
From 96cfc76def123141d0cecaab857da3880396d5ef Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Thu, 9 Mar 2017 22:11:00 +0200
|
||||
Subject: [PATCH] Avoid host contamination from gpg-config
|
||||
|
||||
getconfig is calling gpgme-config (from the source tree) and it
|
||||
gives -L{libdir} (i.e. -L/usr/lib) as the first item for linking.
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
lang/python/setup.py.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lang/python/setup.py.in b/lang/python/setup.py.in
|
||||
index 213fe33..22629e2 100755
|
||||
--- a/lang/python/setup.py.in
|
||||
+++ b/lang/python/setup.py.in
|
||||
@@ -86,7 +86,7 @@ subprocess.check_call([sys.executable, "gpgme-h-clean.py", gpg_error_h],
|
||||
stdout=open("errors.i", "w"))
|
||||
|
||||
define_macros = []
|
||||
-libs = getconfig('libs')
|
||||
+libs = getconfig('libs')[1:]
|
||||
|
||||
# Define extra_macros for both the SWIG and C code
|
||||
for k, v in extra_macros.items():
|
||||
--
|
||||
2.11.0
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
From 4d714c097e497b63d2e8b22a834c671045e215e9 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Thu, 9 Mar 2017 21:34:55 +0200
|
||||
Subject: [PATCH] Correctly install python modules
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
lang/python/Makefile.am | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
|
||||
index e32fd12..5ecf6fb 100644
|
||||
--- a/lang/python/Makefile.am
|
||||
+++ b/lang/python/Makefile.am
|
||||
@@ -102,6 +102,7 @@ install-exec-local:
|
||||
for PYTHON in $(PYTHONS); do \
|
||||
$$PYTHON setup.py install \
|
||||
--prefix $(DESTDIR)$(prefix) \
|
||||
+ --install-lib=$(DESTDIR)${pythondir} \
|
||||
--record files.txt \
|
||||
--verbose ; \
|
||||
cat files.txt >> install_files.txt ; \
|
||||
--
|
||||
2.11.0
|
||||
|
|
@ -13,6 +13,8 @@ UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
|
|||
SRC_URI = "${GNUPG_MIRROR}/gpgme/${BP}.tar.bz2 \
|
||||
file://pkgconfig.patch \
|
||||
file://python-lang-config.patch \
|
||||
file://0001-Correctly-install-python-modules.patch \
|
||||
file://0001-Avoid-host-contamination-from-gpg-config.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "722a4153904b9b5dc15485a22d29263b"
|
||||
|
|
Loading…
Reference in New Issue