diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2017-08-16 04:31:21 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-18 10:40:08 +0100 |
commit | b18a7adf8ce194b2dd3ce787228fb87c5ef3efde (patch) | |
tree | ad17822376f626a2d13703b1701ef3ac5518e60b /meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch | |
parent | e12fa3ac08962accb6585e2aa1c486e7852d174d (diff) | |
download | openembedded-core-contrib-b18a7adf8ce194b2dd3ce787228fb87c5ef3efde.tar.gz |
gpgme: 1.8.0 -> 1.9.0
Rebase patches:
- pkgconfig.patch -> 0001
- python-lang-config.patch -> 0002
- 0001-Correctly-install-python-modules.patch -> 0003
- python-import.patch -> 0004
- 0001-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch -> 0005
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch')
-rw-r--r-- | meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch b/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch new file mode 100644 index 0000000000..7a6cc7b84d --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme/0005-gpgme-config-skip-all-lib-or-usr-lib-directories-in-.patch @@ -0,0 +1,31 @@ +From 064ae4441e2c11329748a18157988f9e953f9752 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Thu, 13 Apr 2017 16:40:27 +0300 +Subject: [PATCH 5/5] 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 <alex.kanavin@gmail.com> +--- + 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.8.1 + |