libbsd: Fix conflict error when enable multilib.
PATCH v2 1/1 libbsd: Fix conflict error when enable multilib.
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.
--- meta/recipes-support/libbsd/libbsd_0.12.2.bb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
meta/recipes-support/libbsd/libbsd_0.12.2.bb +7 -1
@@ -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"
Signature · 1 line
2.34.1
meta/recipes-support/libbsd/libbsd_0.12.2.bb SRC_URI = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz" · line 49
Quoted 4 lines · leimaohui via lists.openembedded.org
- The path of
cdefs-64.handcdefs-32.hincdefs.his not correct for libbsd after enableoe_multilib_headeroncdefs.h. It is necessary to fix the path.meta/recipes-support/libbsd/libbsd_0.12.2.bb +3
-0+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
Can you explain a bit more? Why and how is it not correct? Why isn't a similar fix needed in other uses of oe_multilib_header?
Alex
Hi, Alex
Quoted 2 lines
Can you explain a bit more? Why and how is it not correct? Why isn't a similar fix needed in other uses of
oe_multilib_header?
Reference to https://man.archlinux.org/man/libbsd.7, by default, libbsd is built in an overlay mode, the includes in this case should be the usual system ones, such as <unistd.h> without namespaced with bsd/. It seems that libbsd is special.
Best regards
Lei
Quoted 20 lines
-----Original Message-----
From: Alexander Kanavin <[email protected]>
Sent: Thursday, April 18, 2024 1:33 PM
To: Lei, Maohui <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core][PATCH v2] libbsd: Fix conflict error when enable multilib.Quoted 1 line · leimaohui via lists.openembedded.org
- The path of
cdefs-64.handcdefs-32.hincdefs.his not correct for libbsd afterenable
oe_multilib_headeroncdefs.h. It is necessary to fix the path.meta/recipes-support/libbsd/libbsd_0.12.2.bb SRC_URI = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
Quoted 4 lines
meta/recipes-support/libbsd/libbsd_0.12.2.bb +4
-0+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.hCan you explain a bit more? Why and how is it not correct? Why isn't a similar fix needed in other uses of
oe_multilib_header?Alex
A message that is not in the archive (sent off-list or not yet received): [email protected]
Ping
Quoted 44 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of leimaohui via lists.openembedded.org
Sent: Friday, April 19, 2024 9:16 AM
To: Alexander Kanavin <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core][PATCH v2] libbsd: Fix conflict error when enable multilib.Hi, Alex
Quoted 2 lines
Can you explain a bit more? Why and how is it not correct? Why isn't a similar fix needed in other uses of
oe_multilib_header?Reference to https://man.archlinux.org/man/libbsd.7, by default, libbsd is built in an overlay mode, the includes in this case should be the usual system ones, such as <
unistd.h> without namespaced with bsd/.
It seems that libbsd is special.Best regards
LeiQuoted 21 lines
-----Original Message-----
From: Alexander Kanavin <[email protected]>
Sent: Thursday, April 18, 2024 1:33 PM
To: Lei, Maohui <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core][PATCH v2] libbsd: Fix conflict error when enable multilib.Quoted 2 lines · leimaohui via lists.openembedded.org
- The path of
cdefs-64.handcdefs-32.hincdefs.his not correct for libbsd afterenable
oe_multilib_headeroncdefs.h. It is necessary to fix the path.meta/recipes-support/libbsd/libbsd_0.12.2.bb SRC_URI = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
Quoted 4 lines
meta/recipes-support/libbsd/libbsd_0.12.2.bb +4
-0+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.hCan you explain a bit more? Why and how is it not correct? Why isn't a similar fix needed in other uses of
oe_multilib_header?Alex
It would help if you show the actual content that is being fixed. E.g. the problematic line in the header:
- before the fixing
- after being processed with oe_multilib_header
- after being fixed with sed.
Otherwise I still don't quite understand what is happening.
Alex
Quoted 49 lines · Maohui Lei (Fujitsu)
Ping
Quoted 44 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of leimaohui via lists.openembedded.org
Sent: Friday, April 19, 2024 9:16 AM
To: Alexander Kanavin <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core][PATCH v2] libbsd: Fix conflict error when enable multilib.Hi, Alex
Quoted 2 lines
Can you explain a bit more? Why and how is it not correct? Why isn't a similar fix needed in other uses of
oe_multilib_header?Reference to https://man.archlinux.org/man/libbsd.7, by default, libbsd is built in an overlay mode, the includes in this case should be the usual system ones, such as <
unistd.h> without namespaced with bsd/.
It seems that libbsd is special.Best regards
LeiQuoted 21 lines
-----Original Message-----
From: Alexander Kanavin <[email protected]>
Sent: Thursday, April 18, 2024 1:33 PM
To: Lei, Maohui <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core][PATCH v2] libbsd: Fix conflict error when enable multilib.Quoted 2 lines · leimaohui via lists.openembedded.org
- The path of
cdefs-64.handcdefs-32.hincdefs.his not correct for libbsd afterenable
oe_multilib_headeroncdefs.h. It is necessary to fix the path.meta/recipes-support/libbsd/libbsd_0.12.2.bb SRC_URI = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
Quoted 4 lines
meta/recipes-support/libbsd/libbsd_0.12.2.bb +4
-0+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.hCan you explain a bit more? Why and how is it not correct? Why isn't a similar fix needed in other uses of
oe_multilib_header?Alex
Hi, Alex
Quoted 5 lines
It would help if you show the actual content that is being fixed. E.g. the problematic line in the header:
- before the fixing
- after being processed withoe_multilib_header
- after being fixed with sed.
I have submitted the v3 patch with above content. Please have a look.
Best regards
Lei
Quoted 72 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Alexander Kanavin
Sent: Wednesday, April 24, 2024 4:38 PM
To: Lei, Maohui <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core][PATCH v2] libbsd: Fix conflict error when enable multilib.It would help if you show the actual content that is being fixed. E.g. the problematic line in the header:
- before the fixing
- after being processed withoe_multilib_header
- after being fixed with sed.Otherwise I still don't quite understand what is happening.
Alex
Quoted 13 lines · Maohui Lei (Fujitsu)
Ping
Quoted 8 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of leimaohui via lists.openembedded.org
Sent: Friday, April 19, 2024 9:16 AM
To: Alexander Kanavin <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core][PATCH v2] libbsd: Fix conflict error when enablemultilib.
Quoted 15 lines
Quoted 15 lines
Hi, Alex
Quoted 2 lines
Can you explain a bit more? Why and how is it not correct? Why isn't a similar fix needed in other uses of
oe_multilib_header?Reference to https://man.archlinux.org/man/libbsd.7, by default, libbsd is built in an overlay mode, the includes in this case should be the usual system ones, such as <
unistd.h> without namespaced with bsd/. It seems that libbsd is special.Best regards
LeiQuoted 6 lines
Quoted 6 lines
Quoted 6 lines
-----Original Message-----
From: Alexander Kanavin <[email protected]>
Sent: Thursday, April 18, 2024 1:33 PM
To: Lei, Maohui <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core][PATCH v2] libbsd: Fix conflict error when enablemultilib.
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Quoted 2 lines · leimaohui via lists.openembedded.org
- The path of
cdefs-64.handcdefs-32.hincdefs.his not correct for libbsd afterenable
oe_multilib_headeroncdefs.h. It is necessary to fix the path.meta/recipes-support/libbsd/libbsd_0.12.2.bb SRC_URI = "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
Quoted 4 lines
meta/recipes-support/libbsd/libbsd_0.12.2.bb +4
-0+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.hCan you explain a bit more? Why and how is it not correct? Why isn't a similar fix needed in other uses of
oe_multilib_header?Alex