[oe-commits] [openembedded-core] 24/31: libevent: fix the multilib header conflict

[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 74172e3a406b56cb9a041965df87d7a5b55b03bb
Author: Zhixiong Chi <zhixiong.chi at windriver.com>
AuthorDate: Mon Aug 13 00:04:23 2018 -0700

    libevent: fix the multilib header conflict
    
    Error: Transaction check error:
      file /usr/include/event2/event-config.h conflicts between attempted installs of libevent-dev-2.1.8-r0.skylake_64 and lib32-libevent-dev-2.1.8-r0.x86
    
    The conflict is the size macro definition between 32bit and 64bit
    such as:
    < #define EVENT__SIZEOF_LONG 8
    > #define EVENT__SIZEOF_LONG 4
    < #define EVENT__SIZEOF_PTHREAD_T 8
    > #define EVENT__SIZEOF_PTHREAD_T 4
    
    Signed-off-by: Zhixiong Chi <zhixiong.chi at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-support/libevent/libevent_2.1.8.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-support/libevent/libevent_2.1.8.bb b/meta/recipes-support/libevent/libevent_2.1.8.bb
index 83ce464..0f91e05 100644
--- a/meta/recipes-support/libevent/libevent_2.1.8.bb
+++ b/meta/recipes-support/libevent/libevent_2.1.8.bb
@@ -28,12 +28,16 @@ inherit autotools
 # Needed for Debian packaging
 LEAD_SONAME = "libevent-2.1.so"
 
-inherit ptest
+inherit ptest multilib_header
 
 DEPENDS = "zlib"
 
 BBCLASSEXTEND = "native nativesdk"
 
+do_install_append() {
+        oe_multilib_header event2/event-config.h
+}
+
 do_install_ptest() {
 	install -d ${D}${PTEST_PATH}/test
 	for file in ${B}/test/.libs/regress ${B}/test/.libs/test*

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