summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2023-01-14 07:49:17 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-01-16 10:42:07 +0000
commitbe0cb1a7119b7e9cf2f1c89e73270b16ba4d1906 (patch)
tree0d01f8d0bea3cac47741524d642be67c5cc96c34
parent7205f011a3c39f2b783e7b1df3355bcdc92d7aef (diff)
downloadpoky-be0cb1a7119b7e9cf2f1c89e73270b16ba4d1906.tar.gz
cpio: Do not use _Noreturn in gnulib
Backport a gnulib patch (From OE-Core rev: 1baf1f2b5baaced3affe036e104e20e33c1c5016) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/cpio/cpio-2.13/0001-obstack-Fix-a-clang-warning.patch27
-rw-r--r--meta/recipes-extended/cpio/cpio_2.13.bb1
2 files changed, 28 insertions, 0 deletions
diff --git a/meta/recipes-extended/cpio/cpio-2.13/0001-obstack-Fix-a-clang-warning.patch b/meta/recipes-extended/cpio/cpio-2.13/0001-obstack-Fix-a-clang-warning.patch
new file mode 100644
index 0000000000..6f6e396ef3
--- /dev/null
+++ b/meta/recipes-extended/cpio/cpio-2.13/0001-obstack-Fix-a-clang-warning.patch
@@ -0,0 +1,27 @@
1From 02f1f63d3ff58f3473f1689a0322a234ce10b659 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 13 Jan 2023 22:13:45 -0800
4Subject: [PATCH] obstack: Fix a clang warning
5
6Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=0cc39712803ade7b2d4b89c36b143dad72404063]
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9 gnu/obstack.c | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/gnu/obstack.c b/gnu/obstack.c
13index 54b675d..4d6a1d5 100644
14--- a/gnu/obstack.c
15+++ b/gnu/obstack.c
16@@ -326,7 +326,7 @@ int obstack_exit_failure = EXIT_FAILURE;
17 # include <libio/iolibio.h>
18 # endif
19
20-static _Noreturn void
21+static __attribute_noreturn__ void
22 print_and_abort (void)
23 {
24 /* Don't change any of these strings. Yes, it would be possible to add
25--
262.39.0
27
diff --git a/meta/recipes-extended/cpio/cpio_2.13.bb b/meta/recipes-extended/cpio/cpio_2.13.bb
index e72a114de9..50d3e14c14 100644
--- a/meta/recipes-extended/cpio/cpio_2.13.bb
+++ b/meta/recipes-extended/cpio/cpio_2.13.bb
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
9SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ 9SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \
10 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ 10 file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
11 file://0002-src-global.c-Remove-superfluous-declaration-of-progr.patch \ 11 file://0002-src-global.c-Remove-superfluous-declaration-of-progr.patch \
12 file://0001-obstack-Fix-a-clang-warning.patch \
12 file://CVE-2021-38185.patch \ 13 file://CVE-2021-38185.patch \
13 " 14 "
14 15