diff options
Diffstat (limited to 'meta/recipes-support/p11-kit/files/strerror-1.patch')
-rw-r--r-- | meta/recipes-support/p11-kit/files/strerror-1.patch | 76 |
1 files changed, 0 insertions, 76 deletions
diff --git a/meta/recipes-support/p11-kit/files/strerror-1.patch b/meta/recipes-support/p11-kit/files/strerror-1.patch deleted file mode 100644 index 6af4fee724..0000000000 --- a/meta/recipes-support/p11-kit/files/strerror-1.patch +++ /dev/null | |||
@@ -1,76 +0,0 @@ | |||
1 | From 3ba2c55dfdc8ff20de369f07f6c57d08718d3add Mon Sep 17 00:00:00 2001 | ||
2 | From: Adam Sampson <ats@offog.org> | ||
3 | Date: Sun, 2 Jul 2023 15:22:49 +0100 | ||
4 | Subject: [PATCH] Check for GNU strerror_r using the compiler only | ||
5 | |||
6 | The new test that was added to distinguish GNU/XSI strerror_r ran a | ||
7 | compiled program, which doesn't work when cross-compiling. The only | ||
8 | difference at compile time is that the GNU version returns char * and | ||
9 | the XSI version returns int, so detect it by compiling a program that | ||
10 | dereferences the return value. | ||
11 | |||
12 | Signed-off-by: Adam Sampson <ats@offog.org> | ||
13 | |||
14 | Upstream-Status: Backport | ||
15 | Signed-off-by: Ross Burton <ross.burton@arm.com> | ||
16 | --- | ||
17 | configure.ac | 19 +++++++------------ | ||
18 | meson.build | 10 +++++----- | ||
19 | 2 files changed, 12 insertions(+), 17 deletions(-) | ||
20 | |||
21 | diff --git a/configure.ac b/configure.ac | ||
22 | index 40f5a583..29890622 100644 | ||
23 | --- a/configure.ac | ||
24 | +++ b/configure.ac | ||
25 | @@ -146,19 +146,14 @@ if test "$os_unix" = "yes"; then | ||
26 | |||
27 | AC_CHECK_FUNC( | ||
28 | [strerror_r], | ||
29 | - [AC_RUN_IFELSE( | ||
30 | - [AC_LANG_SOURCE([[ | ||
31 | - #include <errno.h> | ||
32 | - #include <string.h> | ||
33 | - | ||
34 | - int main (void) | ||
35 | - { | ||
36 | - char buf[32]; | ||
37 | - return strerror_r (EINVAL, buf, 32); | ||
38 | - } | ||
39 | - ]])], | ||
40 | - [AC_DEFINE([HAVE_XSI_STRERROR_R], 1, [Whether XSI-compliant strerror_r() is available])], | ||
41 | + [AC_COMPILE_IFELSE( | ||
42 | + [AC_LANG_PROGRAM([[#include <errno.h> | ||
43 | + #include <string.h>]], | ||
44 | + [[/* GNU strerror_r returns char *, XSI returns int */ | ||
45 | + char buf[32]; | ||
46 | + return *strerror_r (EINVAL, buf, 32);]])], | ||
47 | [AC_DEFINE([HAVE_GNU_STRERROR_R], 1, [Whether GNU-specific strerror_r() is available])], | ||
48 | + [AC_DEFINE([HAVE_XSI_STRERROR_R], 1, [Whether XSI-compliant strerror_r() is available])], | ||
49 | [])], | ||
50 | []) | ||
51 | |||
52 | diff --git a/meson.build b/meson.build | ||
53 | index 0f8c8da0..4cc3f89a 100644 | ||
54 | --- a/meson.build | ||
55 | +++ b/meson.build | ||
56 | @@ -306,15 +306,15 @@ if cc.has_function('strerror_r', prefix: '#include <string.h>') | ||
57 | |||
58 | int main (void) | ||
59 | { | ||
60 | + /* GNU strerror_r returns char *, XSI returns int */ | ||
61 | char buf[32]; | ||
62 | - return strerror_r (EINVAL, buf, 32); | ||
63 | + return *strerror_r (EINVAL, buf, 32); | ||
64 | } | ||
65 | ''' | ||
66 | - strerror_r_check = cc.run(strerror_r_code, name : 'strerror_r check') | ||
67 | - if strerror_r_check.returncode() == 0 | ||
68 | - conf.set('HAVE_XSI_STRERROR_R', 1) | ||
69 | - else | ||
70 | + if cc.compiles(strerror_r_code, name : 'GNU strerror_r check') | ||
71 | conf.set('HAVE_GNU_STRERROR_R', 1) | ||
72 | + else | ||
73 | + conf.set('HAVE_XSI_STRERROR_R', 1) | ||
74 | endif | ||
75 | endif | ||
76 | |||