[oe-commits] [openembedded-core] 14/23: libgpg-error: Fix multilib header conflict - pg-error.h and gpgrt.h

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 66b0f977cc1809616b78939f8096330e7c8a94de
Author: Zhang Xiao <xiao.zhang at windriver.com>
AuthorDate: Sun Mar 11 17:32:56 2018 -0700

    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 at windriver.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-support/libgpg-error/libgpg-error_1.27.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 b2e2d50..b74f079 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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.