From: Zhang Xiao <xiao.zhang@windriver.com>
Date: Mon, 12 Mar 2018 00:32:56 +0000 (-0700)
Subject: libgpg-error: Fix multilib header conflict - pg-error.h and gpgrt.h
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=508ab8b836a5e69737539d0e0e3d828c936d4407;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

libgpg-error: Fix multilib header conflict - pg-error.h and gpgrt.h

Header file conflict between 32-bit and 64-bit versions.

(From OE-Core rev: 66b0f977cc1809616b78939f8096330e7c8a94de)

Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

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 b2e2d507c91..b74f079f5d6 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"