From 84cb611079b7cf78b9921c78978943fa4adae1c7 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 13 Apr 2017 16:50:11 +0300 Subject: 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 Signed-off-by: Richard Purdie --- ...g-skip-all-lib-or-usr-lib-directories-in-.patch | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 meta/recipes-support/gpgme/gpgme/0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch (limited to 'meta/recipes-support/gpgme/gpgme/0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch') 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 @@ +From 8c317f6186bd3a9a1c80b4d1e872b3db95934bb6 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Thu, 13 Apr 2017 16:40:27 +0300 +Subject: [PATCH] gpgme-config: skip all /lib* or /usr/lib* directories in + output + +The logic was not working in multilib setups which use other +directory names than plain /lib or /usr/lib. + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Alexander Kanavin +--- + src/gpgme-config.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/gpgme-config.in b/src/gpgme-config.in +index a4d152e..8342865 100644 +--- a/src/gpgme-config.in ++++ b/src/gpgme-config.in +@@ -154,7 +154,7 @@ while test $# -gt 0; do + for i in $libs $tmp_l $assuan_libs $gpg_error_libs $tmp_x; do + skip=no + case $i in +- -L/usr/lib|-L/lib) ++ -L/usr/lib*|-L/lib*) + skip=yes + ;; + -L*|-l*) +-- +2.11.0 + -- cgit v1.2.3