summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-04-13 16:50:11 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-04-14 09:47:08 +0100
commit575f8b48192cbe80f4dfe2ba43b1510e1d0e938e (patch)
tree6ca9fe17f5803cd5a339b21cfdb3905d770f30db
parenta84a323e4d72e40591446bd8aef37577ec084776 (diff)
downloadpoky-575f8b48192cbe80f4dfe2ba43b1510e1d0e938e.tar.gz
gpgme: correctly avoid host contamination
Existing patch was actually doing the wrong thing and sometimes removing a linking flag (-lgpgme) that should be present. Instead, gpgme-config actually has internal logic to remove /usr/lib from the output, which works only in non-multilib setups, so it is adjusted to include all possible /usr/lib* and /lib* directories. (From OE-Core rev: 84cb611079b7cf78b9921c78978943fa4adae1c7) 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-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch31
-rw-r--r--meta/recipes-support/gpgme/gpgme_1.8.0.bb2
3 files changed, 32 insertions, 31 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
deleted file mode 100644
index 6ce58ba3f6..0000000000
--- a/meta/recipes-support/gpgme/gpgme/0001-Avoid-host-contamination-from-gpg-config.patch
+++ /dev/null
@@ -1,30 +0,0 @@
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-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch b/meta/recipes-support/gpgme/gpgme/0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch
new file mode 100644
index 0000000000..84d55b9685
--- /dev/null
+++ b/meta/recipes-support/gpgme/gpgme/0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch
@@ -0,0 +1,31 @@
1From 8c317f6186bd3a9a1c80b4d1e872b3db95934bb6 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 13 Apr 2017 16:40:27 +0300
4Subject: [PATCH] gpgme-config: skip all /lib* or /usr/lib* directories in
5 output
6
7The logic was not working in multilib setups which use other
8directory names than plain /lib or /usr/lib.
9
10Upstream-Status: Inappropriate [oe-core specific]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 src/gpgme-config.in | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/src/gpgme-config.in b/src/gpgme-config.in
17index a4d152e..8342865 100644
18--- a/src/gpgme-config.in
19+++ b/src/gpgme-config.in
20@@ -154,7 +154,7 @@ while test $# -gt 0; do
21 for i in $libs $tmp_l $assuan_libs $gpg_error_libs $tmp_x; do
22 skip=no
23 case $i in
24- -L/usr/lib|-L/lib)
25+ -L/usr/lib*|-L/lib*)
26 skip=yes
27 ;;
28 -L*|-l*)
29--
302.11.0
31
diff --git a/meta/recipes-support/gpgme/gpgme_1.8.0.bb b/meta/recipes-support/gpgme/gpgme_1.8.0.bb
index eddf3a0399..cb9143aded 100644
--- a/meta/recipes-support/gpgme/gpgme_1.8.0.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.8.0.bb
@@ -14,8 +14,8 @@ SRC_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 \ 16 file://0001-Correctly-install-python-modules.patch \
17 file://0001-Avoid-host-contamination-from-gpg-config.patch \
18 file://python-import.patch \ 17 file://python-import.patch \
18 file://0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch \
19 " 19 "
20 20
21SRC_URI[md5sum] = "722a4153904b9b5dc15485a22d29263b" 21SRC_URI[md5sum] = "722a4153904b9b5dc15485a22d29263b"