summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libgpg-error
diff options
context:
space:
mode:
authorZhang Xiao <xiao.zhang@windriver.com>2018-03-11 17:32:56 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-15 03:38:48 -0700
commit66b0f977cc1809616b78939f8096330e7c8a94de (patch)
treebeb0acda3112a539e45bce74d94d467d985891d5 /meta/recipes-support/libgpg-error
parent53f320797765b5f184a83cd065f9b5e454ee14e3 (diff)
downloadopenembedded-core-66b0f977cc1809616b78939f8096330e7c8a94de.tar.gz
openembedded-core-66b0f977cc1809616b78939f8096330e7c8a94de.tar.bz2
openembedded-core-66b0f977cc1809616b78939f8096330e7c8a94de.zip
libgpg-error: Fix multilib header conflict - pg-error.h and gpgrt.h
Header file conflict between 32-bit and 64-bit versions. Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-support/libgpg-error')
-rw-r--r--meta/recipes-support/libgpg-error/libgpg-error_1.27.bb3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb b/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb
index b2e2d507c9..b74f079f5d 100644
--- a/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb
+++ b/meta/recipes-support/libgpg-error/libgpg-error_1.27.bb
@@ -21,7 +21,7 @@ SRC_URI[sha256sum] = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a2
BINCONFIG = "${bindir}/gpg-error-config"
-inherit autotools binconfig-disabled pkgconfig gettext
+inherit autotools binconfig-disabled pkgconfig gettext multilib_header
CPPFLAGS += "-P"
do_compile_prepend() {
TARGET_FILE=linux-gnu
@@ -53,6 +53,7 @@ do_compile_prepend() {
do_install_append() {
# we don't have common lisp in OE
rm -rf "${D}${datadir}/common-lisp/"
+ oe_multilib_header gpg-error.h gpgrt.h
}
FILES_${PN}-dev += "${bindir}/gpg-error"