| Message ID | 20241107024327.1354616-1-yi.zhao@windriver.com |
|---|---|
| State | New |
| Headers | show |
| Series | libbsd: fix header conflict for multilib | expand |
On Thu, 2024-11-07 at 10:43 +0800, Yi Zhao via lists.openembedded.org wrote: > The cdefs.h was modify for time32 and time64 respectively in 0.12.2[1]. > > Fix: > Error: Transaction test error: > file /usr/include/bsd/sys/cdefs.h conflicts between attempted installs > of libbsd-dev-0.12.2-r0.core2_64 and lib32-libbsd-dev-0.12.2-r0.x86 > > [1] https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/32d18dcf47a8ac9f0e21b787bc154f8ca72dbdd8 > > Signed-off-by: Yi Zhao <yi.zhao@windriver.com> > --- > meta/recipes-support/libbsd/libbsd_0.12.2.bb | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > Sadly it isn't this simple and has been discussed before: https://lists.openembedded.org/g/openembedded-core/topic/105817273#msg199192 I'm open to ideas but there are challenges here. Cheers, Richard
diff --git a/meta/recipes-support/libbsd/libbsd_0.12.2.bb b/meta/recipes-support/libbsd/libbsd_0.12.2.bb index 7d5e88f293..0a71653cfb 100644 --- a/meta/recipes-support/libbsd/libbsd_0.12.2.bb +++ b/meta/recipes-support/libbsd/libbsd_0.12.2.bb @@ -40,8 +40,12 @@ 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" BBCLASSEXTEND = "native nativesdk" + +do_install:append() { + oe_multilib_header bsd/sys/cdefs.h +}
The cdefs.h was modify for time32 and time64 respectively in 0.12.2[1]. Fix: Error: Transaction test error: file /usr/include/bsd/sys/cdefs.h conflicts between attempted installs of libbsd-dev-0.12.2-r0.core2_64 and lib32-libbsd-dev-0.12.2-r0.x86 [1] https://gitlab.freedesktop.org/libbsd/libbsd/-/commit/32d18dcf47a8ac9f0e21b787bc154f8ca72dbdd8 Signed-off-by: Yi Zhao <yi.zhao@windriver.com> --- meta/recipes-support/libbsd/libbsd_0.12.2.bb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)