From: Philippe Gerum <rpm@xenomai.org>
To: Jan Kiszka <jan.kiszka@siemens.com>
Cc: "Kowalsky, Clara (T CED SES-DE)" <clara.kowalsky@siemens.com>,
Xenomai <xenomai@lists.linux.dev>
Subject: Re: [libevl][PATCH v2] meson: setup-uapi: Take Debian multiarch into account
Date: Tue, 02 Jan 2024 15:22:45 +0100 [thread overview]
Message-ID: <87zfxn24sj.fsf@xenomai.org> (raw)
In-Reply-To: <2f68d6bd-a3f2-4602-a72a-9d9ba5ced50c@siemens.com>
Jan Kiszka <jan.kiszka@siemens.com> writes:
> From: Jan Kiszka <jan.kiszka@siemens.com>
>
> Check also the Debian multiarch include path for the chosen architecture
> so that we can support (self-built) linux-libc-dev packages that contain
> the evl headers.
>
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>
> Changes in v2:
> - fix typo in DEB_HOST_ARCH spotted by Clara
>
> meson/setup-uapi.sh | 12 +++++++++++-
> 1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/meson/setup-uapi.sh b/meson/setup-uapi.sh
> index f2d0774..633c5ed 100644
> --- a/meson/setup-uapi.sh
> +++ b/meson/setup-uapi.sh
> @@ -17,7 +17,17 @@ if test -r $UAPI/Kbuild; then
> link_dir $UAPI/arch/$ARCH/include/uapi/asm/evl asm
> link_dir $UAPI/include/uapi/asm-generic .
> else
> + DEB_HOST_ARCH=$ARCH
> + if [ "$DEB_HOST_ARCH" = "x86" ]; then
> + DEB_HOST_ARCH=amd64
> + fi
> + DEB_HOST_MULTIARCH=$( \
> + dpkg-architecture -q DEB_HOST_MULTIARCH -a $DEB_HOST_ARCH 2>/dev/null)
> link_dir $UAPI/evl .
> - link_dir $UAPI/asm/evl asm
> + if [ -d $UAPI/$DEB_HOST_MULTIARCH/asm/evl ]; then
> + link_dir $UAPI/$DEB_HOST_MULTIARCH/asm/evl asm
> + else
> + link_dir $UAPI/asm/evl asm
> + fi
> link_dir $UAPI/asm-generic .
> fi
Merged, thanks.
--
Philippe.
prev parent reply other threads:[~2024-01-02 14:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-02 13:01 [libevl][PATCH v2] meson: setup-uapi: Take Debian multiarch into account Jan Kiszka
2024-01-02 14:22 ` Philippe Gerum [this message]
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=87zfxn24sj.fsf@xenomai.org \
--to=rpm@xenomai.org \
--cc=clara.kowalsky@siemens.com \
--cc=jan.kiszka@siemens.com \
--cc=xenomai@lists.linux.dev \
/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).