From: "Maohui Lei (Fujitsu)" <leimaohui@fujitsu.com>
To: "openembedded-core@lists.openembedded.org"
<openembedded-core@lists.openembedded.org>
Subject: RE: [OE-core][PATCH v4][PATCH] libbsd: Fix conflict error when enable multilib.
Date: Fri, 10 May 2024 01:19:17 +0000 [thread overview]
Message-ID: <TYCPR01MB1105524607983912E618C3F2FA0E72@TYCPR01MB11055.jpnprd01.prod.outlook.com> (raw)
In-Reply-To: <17CB016975A375B8.19032@lists.openembedded.org>
Ping
> -----Original Message-----
> From: openembedded-core@lists.openembedded.org
> <openembedded-core@lists.openembedded.org> On Behalf Of leimaohui via
> lists.openembedded.org
> Sent: Tuesday, April 30, 2024 4:27 PM
> To: openembedded-core@lists.openembedded.org
> Cc: Lei, Maohui <leimaohui@fujitsu.com>
> Subject: [OE-core][PATCH v4][PATCH] libbsd: Fix conflict error when enable
> multilib.
>
> From: Lei Maohui <leimaohui@fujitsu.com>
>
> - 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.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
>
> - After oe_multilib_header on cdefs.h, the path of cdefs-64.h and cdefs-32.h
> in cdefs.h need 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
> -#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 <leimaohui@fujitsu.com>
> ---
> meta/recipes-support/libbsd/libbsd_0.12.2.bb | 10 +++++++++-
> 1 file changed, 9 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..1791d97dfd 100644
> --- a/meta/recipes-support/libbsd/libbsd_0.12.2.bb
> +++ b/meta/recipes-support/libbsd/libbsd_0.12.2.bb
> @@ -40,8 +40,16 @@ SRC_URI =
> "https://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
>
> SRC_URI[sha256sum] =
> "b88cc9163d0c652aaf39a99991d974ddba1c3a9711db8f1b5838af2a147310
> 14"
>
> -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
> + # 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
next parent reply other threads:[~2024-05-10 1:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <17CB016975A375B8.19032@lists.openembedded.org>
2024-05-10 1:19 ` Maohui Lei (Fujitsu) [this message]
2024-05-10 8:43 ` [OE-core][PATCH v4][PATCH] libbsd: Fix conflict error when enable multilib Alexander Kanavin
2024-05-13 0:45 ` Maohui Lei (Fujitsu)
[not found] ` <17CEE5C1836CC254.26216@lists.openembedded.org>
2024-05-29 2:01 ` Maohui Lei (Fujitsu)
2024-05-29 9:56 ` Alexander Kanavin
2024-04-30 8:27 leimaohui
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=TYCPR01MB1105524607983912E618C3F2FA0E72@TYCPR01MB11055.jpnprd01.prod.outlook.com \
--to=leimaohui@fujitsu.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).