From: Lei Maohui <[email protected]> - The conflict error is as the following: Error: Transaction test error: file /usr/include/bsd/sys/cdefs.h conflicts between attempted installs of libbsd-dev-0.12.1-r0.core2_64 and lib32-libbsd-dev-0.12.1-r0.core2_32
The difference of bsd/sys/cdefs.h between libbsd-dev and lib32-libbsd-dev is as following: /* Define the ABI for the current system. */ -#define LIBBSD_SYS_TIME_BITS 64 +#define LIBBSD_SYS_TIME_BITS 32 #define LIBBSD_SYS_HAS_TIME64 1 - The path of cdefs-64.h and cdefs-32.h in cdefs.h is not correct for libbsd after enable oe_multilib_header on cdefs.h. It is necessary to fix the path. Signed-off-by: Lei Maohui <[email protected]> --- meta/recipes-support/libbsd/libbsd_0.12.2.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/recipes-support/libbsd/libbsd_0.12.2.bb b/meta/recipes-support/libbsd/libbsd_0.12.2.bb index 7d5e88f293..e1fc7d9b3c 100644 --- a/meta/recipes-support/libbsd/libbsd_0.12.2.bb +++ b/meta/recipes-support/libbsd/libbsd_0.12.2.bb @@ -40,8 +40,14 @@ SRC_URI = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz"; SRC_URI[sha256sum] = "b88cc9163d0c652aaf39a99991d974ddba1c3a9711db8f1b5838af2a14731014" -inherit autotools pkgconfig +inherit autotools pkgconfig multilib_header DEPENDS += "libmd" +do_install:append () { + oe_multilib_header bsd/sys/cdefs.h + sed -i 's:#include <bsd/sys/cdefs:#include <sys/cdefs:g' ${D}${includedir}/bsd/sys/cdefs.h +} + + BBCLASSEXTEND = "native nativesdk" -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#198494): https://lists.openembedded.org/g/openembedded-core/message/198494 Mute This Topic: https://lists.openembedded.org/mt/105590332/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
