diff options
author | Zhixiong Chi <zhixiong.chi@windriver.com> | 2018-08-13 00:04:23 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-14 11:36:31 +0100 |
commit | 4e479cee5d87155e2a90801496033f1a03c5ab30 (patch) | |
tree | 4e20a561e202c2d7c73bdf427189b57c72df56de /meta/recipes-support/libevent | |
parent | 96eb506b5b213a2e15d74c1bbf940f563a3b7869 (diff) | |
download | poky-4e479cee5d87155e2a90801496033f1a03c5ab30.tar.gz |
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
(From OE-Core rev: 49f979b13f1bc6ece0f343d41421aba43f8d9e21)
Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libevent')
-rw-r--r-- | meta/recipes-support/libevent/libevent_2.1.8.bb | 6 |
1 files changed, 5 insertions, 1 deletions
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 | |||
28 | # Needed for Debian packaging | 28 | # Needed for Debian packaging |
29 | LEAD_SONAME = "libevent-2.1.so" | 29 | LEAD_SONAME = "libevent-2.1.so" |
30 | 30 | ||
31 | inherit ptest | 31 | inherit ptest multilib_header |
32 | 32 | ||
33 | DEPENDS = "zlib" | 33 | DEPENDS = "zlib" |
34 | 34 | ||
35 | BBCLASSEXTEND = "native nativesdk" | 35 | BBCLASSEXTEND = "native nativesdk" |
36 | 36 | ||
37 | do_install_append() { | ||
38 | oe_multilib_header event2/event-config.h | ||
39 | } | ||
40 | |||
37 | do_install_ptest() { | 41 | do_install_ptest() { |
38 | install -d ${D}${PTEST_PATH}/test | 42 | install -d ${D}${PTEST_PATH}/test |
39 | for file in ${B}/test/.libs/regress ${B}/test/.libs/test* | 43 | for file in ${B}/test/.libs/regress ${B}/test/.libs/test* |