libbsd: Fix conflict error when enable multilib.
A message that is not in the archive (sent off-list or not yet received): [email protected]
Ping
Quoted 87 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of leimaohui via lists.openembedded.org
Sent: Tuesday, April 30, 2024 4:27 PM
To: [email protected]
Cc: Lei, Maohui <[email protected]>
Subject: [OE-core][PATCH v4][PATCH] libbsd: Fix conflict error when enable multilib.From: Lei Maohui <[email protected]>
- Fix the conflict error by
oe_multilib_header. The conflict error is as the following:
Error: Transaction test error:
file/usr/include/bsd/sys/cdefs.hconflicts between attempted installs of
libbsd-dev-0.12.1-r0.core2_64 and lib32-libbsd-dev-0.12.1-r0.core2_32The difference of
bsd/sys/cdefs.hbetween libbsd-dev and lib32-libbsd-dev is as following:/* Define the ABI for the current system. */ -#define
LIBBSD_SYS_TIME_BITS64 +#defineLIBBSD_SYS_TIME_BITS32 #defineLIBBSD_SYS_HAS_TIME641- After
oe_multilib_headeroncdefs.h, the path ofcdefs-64.handcdefs-32.hincdefs.hneed to be corrected for overlay-mode. Please reference to
https://man.archlinux.org/man/libbsd.7 for details.
@@ -12,19 +12,19 @@
#ifdef_MIPS_SIM#if
_MIPS_SIM==_ABIO32(quoted diff) +4
-4-#include <bsd/sys/cdefs-32.h> +#include <sys/cdefs-32.h> #elif _MIPS_SIM == _ABIN32 -#include <bsd/sys/cdefs-n32.h> +#include <sys/cdefs-n32.h> #else #error "Unknown _MIPS_SIM" #endif #else /* _MIPS_SIM is not defined */ -#include <bsd/sys/cdefs-32.h> +#include <sys/cdefs-32.h> #endif #elif __WORDSIZE == 64 -#include <bsd/sys/cdefs-64.h> +#include <sys/cdefs-64.h> #else #error "Unknown __WORDSIZE detected" #endif /* matches #if __WORDSIZE == 32 */Signed-off-by Lei Maohui <[email protected]>--- meta/recipes-support/libbsd/libbsd_0.12.2.bb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)meta/recipes-support/libbsd/libbsd_0.12.2.bb +0
-0@@ -40,8 +40,16 @@ SRC_URI ="https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
SRC_URI[sha256sum] =
"b88cc9163d0c652aaf39a99991d974ddba1c3a9711db8f1b5838af2a14731014"meta/recipes-support/libbsd/libbsd_0.12.2.bb +4
-1-inherit autotools pkgconfig +inherit autotools pkgconfig multilib_header DEPENDS += "libmd" +do_install:append () { + oe_multilib_header bsd/sys/cdefs.h + # It hasn't been tested when libbsd is used in 'namespaced headers'mode according to
meta/recipes-support/libbsd/libbsd_0.12.2.bb +5
-1+ # https://man.archlinux.org/man/libbsd.7. + sed -i 's:#include <bsd/sys/cdefs:#include <sys/cdefs:g' +${D}${includedir}/bsd/sys/cdefs.h } + + BBCLASSEXTEND = "native nativesdk" --2.34.1
It's in abelloni/master-next on poky-contrib. Please read Richard's status email and try to pay attention to them going forward:
https://lists.openembedded.org/g/openembedded-architecture/message/2003
Alex
Quoted 103 lines · leimaohui via lists.openembedded.org
Ping
Quoted 86 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of leimaohui via lists.openembedded.org
Sent: Tuesday, April 30, 2024 4:27 PM
To: [email protected]
Cc: Lei, Maohui <[email protected]>
Subject: [OE-core][PATCH v4][PATCH] libbsd: Fix conflict error when enable multilib.From: Lei Maohui <[email protected]>
- Fix the conflict error by
oe_multilib_header. The conflict error is as the following:
Error: Transaction test error:
file/usr/include/bsd/sys/cdefs.hconflicts between attempted installs of
libbsd-dev-0.12.1-r0.core2_64 and lib32-libbsd-dev-0.12.1-r0.core2_32The difference of
bsd/sys/cdefs.hbetween libbsd-dev and lib32-libbsd-dev is as following:/* Define the ABI for the current system. */ -#define
LIBBSD_SYS_TIME_BITS64 +#defineLIBBSD_SYS_TIME_BITS32 #defineLIBBSD_SYS_HAS_TIME641- After
oe_multilib_headeroncdefs.h, the path ofcdefs-64.handcdefs-32.hincdefs.hneed to be corrected for overlay-mode. Please reference to
https://man.archlinux.org/man/libbsd.7 for details.
@@ -12,19 +12,19 @@
#ifdef_MIPS_SIM#if
_MIPS_SIM==_ABIO32(quoted diff) +4
-4-#include <bsd/sys/cdefs-32.h> +#include <sys/cdefs-32.h> #elif _MIPS_SIM == _ABIN32 -#include <bsd/sys/cdefs-n32.h> +#include <sys/cdefs-n32.h> #else #error "Unknown _MIPS_SIM" #endif #else /* _MIPS_SIM is not defined */ -#include <bsd/sys/cdefs-32.h> +#include <sys/cdefs-32.h> #endif #elif __WORDSIZE == 64 -#include <bsd/sys/cdefs-64.h> +#include <sys/cdefs-64.h> #else #error "Unknown __WORDSIZE detected" #endif /* matches #if __WORDSIZE == 32 */Signed-off-by Lei Maohui <[email protected]>--- meta/recipes-support/libbsd/libbsd_0.12.2.bb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)meta/recipes-support/libbsd/libbsd_0.12.2.bb +0
-0@@ -40,8 +40,16 @@ SRC_URI ="https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
SRC_URI[sha256sum] =
"b88cc9163d0c652aaf39a99991d974ddba1c3a9711db8f1b5838af2a14731014"meta/recipes-support/libbsd/libbsd_0.12.2.bb +4
-1-inherit autotools pkgconfig +inherit autotools pkgconfig multilib_header DEPENDS += "libmd" +do_install:append () { + oe_multilib_header bsd/sys/cdefs.h + # It hasn't been tested when libbsd is used in 'namespaced headers'mode according to
meta/recipes-support/libbsd/libbsd_0.12.2.bb +5
-1+ # https://man.archlinux.org/man/libbsd.7. + sed -i 's:#include <bsd/sys/cdefs:#include <sys/cdefs:g' +${D}${includedir}/bsd/sys/cdefs.h } + + BBCLASSEXTEND = "native nativesdk" --Quoted 1 line
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#199186): https://lists.openembedded.org/g/openembedded-core/message/199186
Mute This Topic: https://lists.openembedded.org/mt/105817273/1686489
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
Hi, Alex
Quoted 2 lines
It's in abelloni/master-next on poky-contrib. Please read Richard's status email and try to pay attention to them going forward:
I got it. Thank you for your reply.
Best regards
Lei
Quoted 128 lines
-----Original Message-----
From: Alexander Kanavin <[email protected]>
Sent: Friday, May 10, 2024 4:43 PM
To: Lei, Maohui <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core][PATCH v4][PATCH] libbsd: Fix conflict error when enable multilib.It's in abelloni/master-next on poky-contrib. Please read Richard's status email and try to pay attention to them going forward:
https://lists.openembedded.org/g/openembedded-architecture/message/20
03Alex
Quoted 75 lines · leimaohui via lists.openembedded.org
Ping
Quoted 69 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of leimaohui via lists.openembedded.org
Sent: Tuesday, April 30, 2024 4:27 PM
To: [email protected]
Cc: Lei, Maohui <[email protected]>
Subject: [OE-core][PATCH v4][PATCH] libbsd: Fix conflict error when enable multilib.From: Lei Maohui <[email protected]>
- Fix the conflict error by
oe_multilib_header. The conflict error is as the
following:
Error: Transaction test error:
file/usr/include/bsd/sys/cdefs.hconflicts between attempted
installs of
libbsd-dev-0.12.1-r0.core2_64 and lib32-libbsd-dev-0.12.1-r0.core2_32The difference of
bsd/sys/cdefs.hbetween libbsd-dev and lib32-libbsd-dev is as following:/* Define the ABI for the current system. */ -#define
LIBBSD_SYS_TIME_BITS64 +#defineLIBBSD_SYS_TIME_BITS32 #defineLIBBSD_SYS_HAS_TIME641- After
oe_multilib_headeroncdefs.h, the path ofcdefs-64.handcdefs-32.hincdefs.hneed to be corrected for overlay-mode. Please reference to
https://man.archlinux.org/man/libbsd.7 for details.
@@ -12,19 +12,19 @@
#ifdef_MIPS_SIM#if
_MIPS_SIM==_ABIO32(quoted diff) +4
-3-#include <bsd/sys/cdefs-32.h> +#include <sys/cdefs-32.h> #elif _MIPS_SIM == _ABIN32 -#include <bsd/sys/cdefs-n32.h> +#include <sys/cdefs-n32.h> #else #error "Unknown _MIPS_SIM" #endif #else /* _MIPS_SIM is not defined */ -#include <bsd/sys/cdefs-32.h> +#include <sys/cdefs-32.h> #endif #elif __WORDSIZE == 64 -#include <bsd/sys/cdefs-64.h> +#include <sys/cdefs-64.h> #else #error "Unknown __WORDSIZE detected" #endif /* matches #if __WORDSIZE == 32 */Signed-off-by Lei Maohui <[email protected]>--- meta/recipes-support/libbsd/libbsd_0.12.2.bb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)meta/recipes-support/libbsd/libbsd_0.12.2.bb +0
-0@@ -40,8 +40,16 @@ SRC_URI ="https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
Quoted 2 lines
Quoted 2 lines
SRC_URI[sha256sum] =
"
b88cc9163d0c652aaf39a99991d974ddba1c3a9711db8f1b5838af2a147310Quoted 21 lines
Quoted 18 lines
14"
meta/recipes-support/libbsd/libbsd_0.12.2.bb +4
-1-inherit autotools pkgconfig +inherit autotools pkgconfig multilib_header DEPENDS += "libmd" +do_install:append () { + oe_multilib_header bsd/sys/cdefs.h + # It hasn't been tested when libbsd is used in 'namespaced headers'mode according to
meta/recipes-support/libbsd/libbsd_0.12.2.bb +5
-1+ # https://man.archlinux.org/man/libbsd.7. + sed -i 's:#include <bsd/sys/cdefs:#include <sys/cdefs:g' +${D}${includedir}/bsd/sys/cdefs.h } + + BBCLASSEXTEND = "native nativesdk" --Quoted 1 line
2.34.1
Quoted 7 lines
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group. View/Reply Online (#199186):
https://lists.openembedded.org/g/openembedded-core/message/199186
Mute This Topic: https://lists.openembedded.org/mt/105817273/1686489
Group Owner: [email protected] Unsubscribe:https://lists.openembedded.org/g/openembedded-core/unsub
Quoted 3 lines
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
A message that is not in the archive (sent off-list or not yet received): [email protected]
Hi,
This patch has not been merged yet and I didn't find it any more. Is there any issue with this patch?
Best regards
Lei
Quoted 143 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of leimaohui via lists.openembedded.org
Sent: Monday, May 13, 2024 8:45 AM
To: Alexander Kanavin <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core][PATCH v4][PATCH] libbsd: Fix conflict error when enable multilib.Hi, Alex
Quoted 2 lines
It's in abelloni/master-next on poky-contrib. Please read Richard's status email and try to pay attention to them going forward:
I got it. Thank you for your reply.
Best regards
LeiQuoted 8 lines
-----Original Message-----
From: Alexander Kanavin <[email protected]>
Sent: Friday, May 10, 2024 4:43 PM
To: Lei, Maohui <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core][PATCH v4][PATCH] libbsd: Fix conflict error when enable multilib.Quoted 4 lines
It's in abelloni/master-next on poky-contrib. Please read Richard's status email and try to pay attention to them going forward:
https://lists.openembedded.org/g/openembedded-architecture/message/20
Quoted 15 lines
03
Alex
Quoted 9 lines · leimaohui via lists.openembedded.org
Ping
Quoted 3 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Ofleimaohui
Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
via lists.openembedded.org
Sent: Tuesday, April 30, 2024 4:27 PM
To: [email protected]
Cc: Lei, Maohui <[email protected]>
Subject: [OE-core][PATCH v4][PATCH] libbsd: Fix conflict error when enable multilib.From: Lei Maohui <[email protected]>
- Fix the conflict error by
oe_multilib_header. The conflict error is as the
following:
Error: Transaction test error:
file/usr/include/bsd/sys/cdefs.hconflicts between attempted
installs of
libbsd-dev-0.12.1-r0.core2_64 and lib32-libbsd-dev-0.12.1-r0.core2_32Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
The difference of
bsd/sys/cdefs.hbetween libbsd-dev and lib32-libbsd-dev is as following:/* Define the ABI for the current system. */ -#define
LIBBSD_SYS_TIME_BITS64 +#defineLIBBSD_SYS_TIME_BITS32#define
Quoted 44 lines
Quoted 44 lines
Quoted 44 lines
LIBBSD_SYS_HAS_TIME641- After
oe_multilib_headeroncdefs.h, the path ofcdefs-64.handcdefs-32.hincdefs.hneed to be corrected for overlay-mode. Please reference to
https://man.archlinux.org/man/libbsd.7 for details.
@@ -12,19 +12,19 @@
#ifdef_MIPS_SIM#if
_MIPS_SIM==_ABIO32(quoted diff) +2
-2-#include <bsd/sys/cdefs-32.h> +#include <sys/cdefs-32.h> #elif _MIPS_SIM == _ABIN32 -#include <bsd/sys/cdefs-n32.h> +#include <sys/cdefs-n32.h> #else #error "Unknown _MIPS_SIM" #endif #else /* _MIPS_SIM is not defined */ -#include<
bsd/sys/cdefs-32.h>(quoted diff) +2
-1+#include <sys/cdefs-32.h> #endif #elif __WORDSIZE == 64 -#include <bsd/sys/cdefs-64.h> +#include <sys/cdefs-64.h> #else #error "Unknown __WORDSIZE detected" #endif /* matches #if __WORDSIZE == 32 */Signed-off-by Lei Maohui <[email protected]>--- meta/recipes-support/libbsd/libbsd_0.12.2.bb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)meta/recipes-support/libbsd/libbsd_0.12.2.bb +0
-0@@ -40,8 +40,16 @@ SRC_URI ="https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
Quoted 3 lines
Quoted 2 lines
Quoted 2 lines
SRC_URI[sha256sum] =
"
b88cc9163d0c652aaf39a99991d974ddba1c3a9711db8f1b5838af2a147310Quoted 23 lines
Quoted 23 lines
Quoted 19 lines
14"
meta/recipes-support/libbsd/libbsd_0.12.2.bb +4
-1-inherit autotools pkgconfig +inherit autotools pkgconfig multilib_header DEPENDS += "libmd" +do_install:append () { + oe_multilib_header bsd/sys/cdefs.h + # It hasn't been tested when libbsd is used in 'namespaced headers'mode according to
meta/recipes-support/libbsd/libbsd_0.12.2.bb +5
-1+ # https://man.archlinux.org/man/libbsd.7. + sed -i 's:#include <bsd/sys/cdefs:#include <sys/cdefs:g' +${D}${includedir}/bsd/sys/cdefs.h } + + BBCLASSEXTEND = "native nativesdk" --2.34.1
It's still in abelloni/master-next, nothing has changed. Where did you look for it?
Alex
Quoted 151 lines · Maohui Lei (Fujitsu)
Hi,
This patch has not been merged yet and I didn't find it any more. Is there any issue with this patch?
Best regards
LeiQuoted 143 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of leimaohui via lists.openembedded.org
Sent: Monday, May 13, 2024 8:45 AM
To: Alexander Kanavin <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core][PATCH v4][PATCH] libbsd: Fix conflict error when enable multilib.Hi, Alex
Quoted 2 lines
It's in abelloni/master-next on poky-contrib. Please read Richard's status email and try to pay attention to them going forward:
I got it. Thank you for your reply.
Best regards
LeiQuoted 8 lines
-----Original Message-----
From: Alexander Kanavin <[email protected]>
Sent: Friday, May 10, 2024 4:43 PM
To: Lei, Maohui <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core][PATCH v4][PATCH] libbsd: Fix conflict error when enable multilib.Quoted 4 lines
It's in abelloni/master-next on poky-contrib. Please read Richard's status email and try to pay attention to them going forward:
https://lists.openembedded.org/g/openembedded-architecture/message/20
Quoted 15 lines
03
Alex
Quoted 9 lines · leimaohui via lists.openembedded.org
Ping
Quoted 3 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Ofleimaohui
Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
via lists.openembedded.org
Sent: Tuesday, April 30, 2024 4:27 PM
To: [email protected]
Cc: Lei, Maohui <[email protected]>
Subject: [OE-core][PATCH v4][PATCH] libbsd: Fix conflict error when enable multilib.From: Lei Maohui <[email protected]>
- Fix the conflict error by
oe_multilib_header. The conflict error is as the
following:
Error: Transaction test error:
file/usr/include/bsd/sys/cdefs.hconflicts between attempted
installs of
libbsd-dev-0.12.1-r0.core2_64 and lib32-libbsd-dev-0.12.1-r0.core2_32Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
The difference of
bsd/sys/cdefs.hbetween libbsd-dev and lib32-libbsd-dev is as following:/* Define the ABI for the current system. */ -#define
LIBBSD_SYS_TIME_BITS64 +#defineLIBBSD_SYS_TIME_BITS32#define
Quoted 44 lines
Quoted 44 lines
Quoted 44 lines
LIBBSD_SYS_HAS_TIME641- After
oe_multilib_headeroncdefs.h, the path ofcdefs-64.handcdefs-32.hincdefs.hneed to be corrected for overlay-mode. Please reference to
https://man.archlinux.org/man/libbsd.7 for details.
@@ -12,19 +12,19 @@
#ifdef_MIPS_SIM#if
_MIPS_SIM==_ABIO32(quoted diff) +2
-2-#include <bsd/sys/cdefs-32.h> +#include <sys/cdefs-32.h> #elif _MIPS_SIM == _ABIN32 -#include <bsd/sys/cdefs-n32.h> +#include <sys/cdefs-n32.h> #else #error "Unknown _MIPS_SIM" #endif #else /* _MIPS_SIM is not defined */ -#include<
bsd/sys/cdefs-32.h>(quoted diff) +2
-1+#include <sys/cdefs-32.h> #endif #elif __WORDSIZE == 64 -#include <bsd/sys/cdefs-64.h> +#include <sys/cdefs-64.h> #else #error "Unknown __WORDSIZE detected" #endif /* matches #if __WORDSIZE == 32 */Signed-off-by Lei Maohui <[email protected]>--- meta/recipes-support/libbsd/libbsd_0.12.2.bb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)meta/recipes-support/libbsd/libbsd_0.12.2.bb +0
-0@@ -40,8 +40,16 @@ SRC_URI ="https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
Quoted 3 lines
Quoted 2 lines
Quoted 2 lines
SRC_URI[sha256sum] =
"
b88cc9163d0c652aaf39a99991d974ddba1c3a9711db8f1b5838af2a147310Quoted 23 lines
Quoted 23 lines
Quoted 19 lines
14"
meta/recipes-support/libbsd/libbsd_0.12.2.bb +4
-1-inherit autotools pkgconfig +inherit autotools pkgconfig multilib_header DEPENDS += "libmd" +do_install:append () { + oe_multilib_header bsd/sys/cdefs.h + # It hasn't been tested when libbsd is used in 'namespaced headers'mode according to
meta/recipes-support/libbsd/libbsd_0.12.2.bb +5
-1+ # https://man.archlinux.org/man/libbsd.7. + sed -i 's:#include <bsd/sys/cdefs:#include <sys/cdefs:g' +${D}${includedir}/bsd/sys/cdefs.h } + + BBCLASSEXTEND = "native nativesdk" --2.34.1
Hi, Alex
Quoted 2 lines
It's still in abelloni/master-next, nothing has changed. Where did you look for it?
I'm sorry I bothered you again.
Yes, it is still in abelloni/master-next. I found it by git clone the repository in local. Previously, I searched it on web paged and didn't find it.
Best regards
Lei
Quoted 171 lines
-----Original Message-----
From: Alexander Kanavin <[email protected]>
Sent: Wednesday, May 29, 2024 5:57 PM
To: Lei, Maohui <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core][PATCH v4][PATCH] libbsd: Fix conflict error when enable multilib.It's still in abelloni/master-next, nothing has changed. Where did you look for it?
Alex
Quoted 4 lines · Maohui Lei (Fujitsu)
Hi,
This patch has not been merged yet and I didn't find it any more. Is there
any issue with this patch?
Quoted 36 lines
Best regards
LeiQuoted 32 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of leimaohui via lists.openembedded.org
Sent: Monday, May 13, 2024 8:45 AM
To: Alexander Kanavin <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core][PATCH v4][PATCH] libbsd: Fix conflict error when enable multilib.Hi, Alex
Quoted 2 lines
It's in abelloni/master-next on poky-contrib. Please read Richard's status email and try to pay attention to them going forward:
I got it. Thank you for your reply.
Best regards
LeiQuoted 12 lines
-----Original Message-----
From: Alexander Kanavin <[email protected]>
Sent: Friday, May 10, 2024 4:43 PM
To: Lei, Maohui <[email protected]>
Cc: [email protected]
Subject: Re: [OE-core][PATCH v4][PATCH] libbsd: Fix conflict error when enable multilib.It's in abelloni/master-next on poky-contrib. Please read Richard's status email and try to pay attention to them going forward:
https://lists.openembedded.org/g/openembedded-architecture/message/2
Quoted 85 lines
Quoted 85 lines
0
Quoted 15 lines
03
Alex
Quoted 9 lines · leimaohui via lists.openembedded.org
Ping
Quoted 3 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Ofleimaohui
Quoted 18 lines
Quoted 18 lines
Quoted 18 lines
via lists.openembedded.org
Sent: Tuesday, April 30, 2024 4:27 PM
To: [email protected]
Cc: Lei, Maohui <[email protected]>
Subject: [OE-core][PATCH v4][PATCH] libbsd: Fix conflict error when enable multilib.From: Lei Maohui <[email protected]>
- Fix the conflict error by
oe_multilib_header. The conflict error is as the
following:
Error: Transaction test error:
file/usr/include/bsd/sys/cdefs.hconflicts between
attempted installs of libbsd-dev-0.12.1-r0.core2_64 and lib32-libbsd-dev-0.12.1-r0.core2_32Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
The difference of
bsd/sys/cdefs.hbetween libbsd-dev and lib32-libbsd-dev is as following:/* Define the ABI for the current system. */ -#define
LIBBSD_SYS_TIME_BITS64 +#defineLIBBSD_SYS_TIME_BITS32#define
Quoted 44 lines
Quoted 44 lines
Quoted 44 lines
LIBBSD_SYS_HAS_TIME641- After
oe_multilib_headeroncdefs.h, the path ofcdefs-64.handcdefs-32.hincdefs.hneed to be corrected for overlay-mode. Please reference to
https://man.archlinux.org/man/libbsd.7 for details.
@@ -12,19 +12,19 @@
#ifdef_MIPS_SIM#if
_MIPS_SIM==_ABIO32(quoted diff) +2
-2-#include <bsd/sys/cdefs-32.h> +#include <sys/cdefs-32.h> #elif _MIPS_SIM == _ABIN32 -#include <bsd/sys/cdefs-n32.h> +#include <sys/cdefs-n32.h> #else #error "Unknown _MIPS_SIM" #endif #else /* _MIPS_SIM is not defined */ -#include<
bsd/sys/cdefs-32.h>(quoted diff) +2
-1+#include <sys/cdefs-32.h> #endif #elif __WORDSIZE == 64 -#include <bsd/sys/cdefs-64.h> +#include <sys/cdefs-64.h> #else #error "Unknown __WORDSIZE detected" #endif /* matches #if __WORDSIZE == 32 */Signed-off-by Lei Maohui <[email protected]>--- meta/recipes-support/libbsd/libbsd_0.12.2.bb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)meta/recipes-support/libbsd/libbsd_0.12.2.bb +0
-0@@ -40,8 +40,16 @@ SRC_URI ="https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
Quoted 4 lines
Quoted 4 lines
Quoted 3 lines
Quoted 2 lines
Quoted 2 lines
SRC_URI[sha256sum] =
"
b88cc9163d0c652aaf39a99991d974ddba1c3a9711db8f1b5838af2a147310Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
meta/recipes-support/libbsd/libbsd_0.12.2.bb
Quoted 10 lines
14"
meta/recipes-support/libbsd/libbsd_0.12.2.bb +4
-1-inherit autotools pkgconfig +inherit autotools pkgconfig multilib_header DEPENDS += "libmd" +do_install:append () { + oe_multilib_header bsd/sys/cdefs.h + # It hasn't been tested when libbsd is used in 'namespacedheaders'
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Quoted 9 lines
mode according to
meta/recipes-support/libbsd/libbsd_0.12.2.bb +5
-1+ # https://man.archlinux.org/man/libbsd.7. + sed -i 's:#include <bsd/sys/cdefs:#include <sys/cdefs:g' +${D}${includedir}/bsd/sys/cdefs.h } + + BBCLASSEXTEND = "native nativesdk" --2.34.1