Re: [Buildroot] [PATCH] package/uclibc: Fix ARC build with 4.x kernel headers

From: Waldemar Brodkorb <wbx@openadk.org>
To: Dmitry Chestnykh <dm.chestnykh@gmail.com>
Cc: buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH] package/uclibc: Fix ARC build with 4.x kernel headers
Date: Sat, 3 Aug 2024 08:34:35 +0200	[thread overview]
Message-ID: <Zq3Pe9f7NIAMWCG7@waldemar-brodkorb.de> (raw)
In-Reply-To: <20240728115817.743185-1-dm.chestnykh@gmail.com>

Hi Dmitry,
Dmitry Chestnykh wrote,

> Provide correct grouping for preprocessor
> conditions to avoid building ld.so with
> undefined macroses which are in use
> 
> Fixes
>   package/uclibc/0003-Fix-arc-build-with-4.x-kernel-headers.patch

Here you have to add the autobuild failure.

> Upstream:
>   https://patchwork.ozlabs.org/project/uclibc-ng/patch/20240728115224.725666-1-dm.chestnykh@gmail.com/

You can update Upstream to the uClibc-ng commit:
https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=841d0729883ee0de606de161c1d6a5c37cedf575

Your Subject is wrong, too.

Can you respin your patch?

best regards
 Waldemar

> Signed-off-by: Dmitry Chestnykh <dm.chestnykh@gmail.com>
> ---
>  ...ix-arc-build-with-4.x-kernel-headers.patch | 34 +++++++++++++++++++
>  1 file changed, 34 insertions(+)
>  create mode 100644 package/uclibc/0003-Fix-arc-build-with-4.x-kernel-headers.patch
> 
> diff --git a/package/uclibc/0003-Fix-arc-build-with-4.x-kernel-headers.patch b/package/uclibc/0003-Fix-arc-build-with-4.x-kernel-headers.patch
> new file mode 100644
> index 0000000000..359d1e98c6
> --- /dev/null
> +++ b/package/uclibc/0003-Fix-arc-build-with-4.x-kernel-headers.patch
> @@ -0,0 +1,34 @@
> +From 1afc19eb6a7948afbcf3dd19091ce127a355ebcb Mon Sep 17 00:00:00 2001
> +From: Dmitry Chestnykh <dm.chestnykh@gmail.com>
> +Date: Sun, 28 Jul 2024 14:12:39 +0300
> +Subject: [PATCH] [ldso] Group conditions after `&&`
> +
> +If the conditions are not grouped we can reach
> +this block even if `__NR_stat` is not defined.
> +
> +`defined __NR_stat && ((!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__))`
> +gives us false but `LINUX_VERSION_CODE <= KERNEL_VERSION(5,1,0))`
> +may give us true. So if linux headers version is below 5.1.0 and
> +__NR_stat is not defined we can have compilation error
> +
> +Signed-off-by: Dmitry Chestnykh <dm.chestnykh@gmail.com>
> +---
> + ldso/include/dl-syscall.h | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/ldso/include/dl-syscall.h b/ldso/include/dl-syscall.h
> +index 9ec0eac60..180d03012 100644
> +--- a/ldso/include/dl-syscall.h
> ++++ b/ldso/include/dl-syscall.h
> +@@ -141,7 +141,7 @@ static __always_inline int _dl_stat(const char *file_name,
> + {
> + 	return _dl_newfstatat(AT_FDCWD, file_name, buf, 0);
> + }
> +-#elif defined __NR_stat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__)) || (LINUX_VERSION_CODE <= KERNEL_VERSION(5,1,0))
> ++#elif defined __NR_stat && (!defined(__UCLIBC_USE_TIME64__) || defined(__sparc__) || (LINUX_VERSION_CODE <= KERNEL_VERSION(5,1,0)))
> + # define __NR__dl_stat __NR_stat
> + static __always_inline _syscall2(int, _dl_stat, const char *, file_name,
> +                         struct stat *, buf)
> +-- 
> +2.45.2
> +
> -- 
> 2.45.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
> 
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot