diff options
Diffstat (limited to 'meta/recipes-extended/cpio')
-rw-r--r-- | meta/recipes-extended/cpio/cpio_2.15.bb (renamed from meta/recipes-extended/cpio/cpio_2.14.bb) | 3 | ||||
-rw-r--r-- | meta/recipes-extended/cpio/files/0001-configure-Include-needed-header-for-major-minor-macr.patch | 48 |
2 files changed, 1 insertions, 50 deletions
diff --git a/meta/recipes-extended/cpio/cpio_2.14.bb b/meta/recipes-extended/cpio/cpio_2.15.bb index 397bb5d87c..52070f59a2 100644 --- a/meta/recipes-extended/cpio/cpio_2.14.bb +++ b/meta/recipes-extended/cpio/cpio_2.15.bb | |||
@@ -7,12 +7,11 @@ LICENSE = "GPL-3.0-only" | |||
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" | 7 | LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" |
8 | 8 | ||
9 | SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ | 9 | SRC_URI = "${GNU_MIRROR}/cpio/cpio-${PV}.tar.gz \ |
10 | file://0001-configure-Include-needed-header-for-major-minor-macr.patch \ | ||
11 | file://run-ptest \ | 10 | file://run-ptest \ |
12 | file://test.sh \ | 11 | file://test.sh \ |
13 | " | 12 | " |
14 | 13 | ||
15 | SRC_URI[sha256sum] = "145a340fd9d55f0b84779a44a12d5f79d77c99663967f8cfa168d7905ca52454" | 14 | SRC_URI[sha256sum] = "efa50ef983137eefc0a02fdb51509d624b5e3295c980aa127ceee4183455499e" |
16 | 15 | ||
17 | inherit autotools gettext texinfo ptest | 16 | inherit autotools gettext texinfo ptest |
18 | 17 | ||
diff --git a/meta/recipes-extended/cpio/files/0001-configure-Include-needed-header-for-major-minor-macr.patch b/meta/recipes-extended/cpio/files/0001-configure-Include-needed-header-for-major-minor-macr.patch deleted file mode 100644 index 95ece0bbf3..0000000000 --- a/meta/recipes-extended/cpio/files/0001-configure-Include-needed-header-for-major-minor-macr.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | From 8179be21e664cedb2e9d238cc2f6d04965e97275 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sergey Poznyakoff <gray@gnu.org> | ||
3 | Date: Thu, 11 May 2023 10:18:44 +0300 | ||
4 | Subject: [PATCH] configure: Include needed header for major/minor macros | ||
5 | |||
6 | This helps in avoiding the warning about implicit function declaration | ||
7 | which is elevated as error with newer compilers e.g. clang 16 | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | |||
11 | Upstream-Status: Backport | ||
12 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
13 | --- | ||
14 | configure.ac | 18 ++++++++++++++++-- | ||
15 | 1 file changed, 16 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/configure.ac b/configure.ac | ||
18 | index de479e7..c601029 100644 | ||
19 | --- a/configure.ac | ||
20 | +++ b/configure.ac | ||
21 | @@ -43,8 +43,22 @@ AC_TYPE_UID_T | ||
22 | AC_CHECK_TYPE(gid_t, int) | ||
23 | |||
24 | AC_HEADER_DIRENT | ||
25 | -AX_COMPILE_CHECK_RETTYPE([major], [0]) | ||
26 | -AX_COMPILE_CHECK_RETTYPE([minor], [0]) | ||
27 | +AX_COMPILE_CHECK_RETTYPE([major], [0], [ | ||
28 | +#include <sys/types.h> | ||
29 | +#ifdef MAJOR_IN_MKDEV | ||
30 | +# include <sys/mkdev.h> | ||
31 | +#endif | ||
32 | +#ifdef MAJOR_IN_SYSMACROS | ||
33 | +# include <sys/sysmacros.h> | ||
34 | +#endif]) | ||
35 | +AX_COMPILE_CHECK_RETTYPE([minor], [0], [ | ||
36 | +#include <sys/types.h> | ||
37 | +#ifdef MAJOR_IN_MKDEV | ||
38 | +# include <sys/mkdev.h> | ||
39 | +#endif | ||
40 | +#ifdef MAJOR_IN_SYSMACROS | ||
41 | +# include <sys/sysmacros.h> | ||
42 | +#endif]) | ||
43 | |||
44 | AC_CHECK_FUNCS([fchmod fchown]) | ||
45 | # This is needed for mingw build | ||
46 | -- | ||
47 | 2.34.1 | ||
48 | |||