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.

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 0 insertions, 30 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 @@
-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
-