diff mbox series

package/uclibc: fix compile issue with gcc 14.x

Message ID ZkSRMq/yXayXrO3S@waldemar-brodkorb.de
State Accepted
Headers show
Series package/uclibc: fix compile issue with gcc 14.x | expand

Commit Message

Waldemar Brodkorb May 15, 2024, 10:40 a.m. UTC
Fixes:
 http://autobuild.buildroot.net/results/d9b924bdea3fd61060fa0e961c12534c1fff80de

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
---
 .../0002-fix-kernel_stat64-definition.patch   | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 package/uclibc/0002-fix-kernel_stat64-definition.patch

Comments

Arnout Vandecappelle June 6, 2024, 7:25 p.m. UTC | #1
On 15/05/2024 12:40, Waldemar Brodkorb wrote:
> Fixes:
>   http://autobuild.buildroot.net/results/d9b924bdea3fd61060fa0e961c12534c1fff80de
> 
> Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>

  Applied to master, thanks.

  Regards,
  Arnout

> ---
>   .../0002-fix-kernel_stat64-definition.patch   | 35 +++++++++++++++++++
>   1 file changed, 35 insertions(+)
>   create mode 100644 package/uclibc/0002-fix-kernel_stat64-definition.patch
> 
> diff --git a/package/uclibc/0002-fix-kernel_stat64-definition.patch b/package/uclibc/0002-fix-kernel_stat64-definition.patch
> new file mode 100644
> index 0000000000..5a87586af8
> --- /dev/null
> +++ b/package/uclibc/0002-fix-kernel_stat64-definition.patch
> @@ -0,0 +1,35 @@
> +From 186878405324e96f61d896a149f623e0c792c972 Mon Sep 17 00:00:00 2001
> +From: Max Filippov <jcmvbkbc@gmail.com>
> +Date: Tue, 14 May 2024 23:18:56 -0700
> +Subject: [PATCH] fix kernel_stat64 definition
> +
> +The commit 74ca8d6f5d2e ("remove UCLIBC_HAS_LFS") removed conditional
> +compilation dependent on __UCLIBC_HAS_LFS__, assuming it to be always
> +defined, but removed the wrong branch in the definition of
> +kernel_stat64.
> +Fix kernel_stat64 definition to be stat64.
> +
> +Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
> +Tested-by: Chris Packham <judge.packham@gmail.com>
> +Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
> +Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=186878405324e96f61d896a149f623e0c792c972
> +---
> + libc/sysdeps/linux/common-generic/bits/kernel_stat.h | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/libc/sysdeps/linux/common-generic/bits/kernel_stat.h b/libc/sysdeps/linux/common-generic/bits/kernel_stat.h
> +index 7a97bb4d7..e874a4a9f 100644
> +--- a/libc/sysdeps/linux/common-generic/bits/kernel_stat.h
> ++++ b/libc/sysdeps/linux/common-generic/bits/kernel_stat.h
> +@@ -18,7 +18,7 @@
> +  * However that requires more #ifndef in relevant wrappers,
> +  * further uglifying them
> +  */
> +-#define kernel_stat64	stat
> ++#define kernel_stat64	stat64
> +
> + #endif	/*  _BITS_STAT_STRUCT_H */
> +
> +--
> +2.30.2
> +
diff mbox series

Patch

diff --git a/package/uclibc/0002-fix-kernel_stat64-definition.patch b/package/uclibc/0002-fix-kernel_stat64-definition.patch
new file mode 100644
index 0000000000..5a87586af8
--- /dev/null
+++ b/package/uclibc/0002-fix-kernel_stat64-definition.patch
@@ -0,0 +1,35 @@ 
+From 186878405324e96f61d896a149f623e0c792c972 Mon Sep 17 00:00:00 2001
+From: Max Filippov <jcmvbkbc@gmail.com>
+Date: Tue, 14 May 2024 23:18:56 -0700
+Subject: [PATCH] fix kernel_stat64 definition
+
+The commit 74ca8d6f5d2e ("remove UCLIBC_HAS_LFS") removed conditional
+compilation dependent on __UCLIBC_HAS_LFS__, assuming it to be always
+defined, but removed the wrong branch in the definition of
+kernel_stat64.
+Fix kernel_stat64 definition to be stat64.
+
+Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
+Tested-by: Chris Packham <judge.packham@gmail.com>
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+Upstream: https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=186878405324e96f61d896a149f623e0c792c972
+---
+ libc/sysdeps/linux/common-generic/bits/kernel_stat.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libc/sysdeps/linux/common-generic/bits/kernel_stat.h b/libc/sysdeps/linux/common-generic/bits/kernel_stat.h
+index 7a97bb4d7..e874a4a9f 100644
+--- a/libc/sysdeps/linux/common-generic/bits/kernel_stat.h
++++ b/libc/sysdeps/linux/common-generic/bits/kernel_stat.h
+@@ -18,7 +18,7 @@
+  * However that requires more #ifndef in relevant wrappers,
+  * further uglifying them
+  */
+-#define kernel_stat64	stat
++#define kernel_stat64	stat64
+ 
+ #endif	/*  _BITS_STAT_STRUCT_H */
+ 
+-- 
+2.30.2
+