From 49f979b13f1bc6ece0f343d41421aba43f8d9e21 Mon Sep 17 00:00:00 2001 From: Zhixiong Chi Date: Mon, 13 Aug 2018 00:04:23 -0700 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-support/libevent/libevent_2.1.8.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'meta') diff --git a/meta/recipes-support/libevent/libevent_2.1.8.bb b/meta/recipes-support/libevent/libevent_2.1.8.bb index 83ce4644cf..0f91e05a6c 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* -- cgit 1.2.3-korg