mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-01-29 21:08:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

p11-kit: fix build without qemu-usermode

Browse Source 
If qemu-usermode is not available then p11-kit fails to configure:

  meson.build:313:24: ERROR: Can not run test applications in this cross environment.

This has already been fixed upstream, so backport the patches.

(From OE-Core rev: 3de715feaaaab9ac1e882a6913e2202203178170)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2023-08-10 17:24:48 +01:00
committed by Richard Purdie
parent 7f58848a32
commit 48e174c386
3 changed files with 109 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
meta/recipes-support/p11-kit/files/strerror-1.patch Normal file
View File

@@ -0,0 +1,76 @@
From 3ba2c55dfdc8ff20de369f07f6c57d08718d3add Mon Sep 17 00:00:00 2001
From: Adam Sampson <ats@offog.org>
Date: Sun, 2 Jul 2023 15:22:49 +0100
Subject: [PATCH] Check for GNU strerror_r using the compiler only
The new test that was added to distinguish GNU/XSI strerror_r ran a
compiled program, which doesn't work when cross-compiling. The only
difference at compile time is that the GNU version returns char * and
the XSI version returns int, so detect it by compiling a program that
dereferences the return value.
Signed-off-by: Adam Sampson <ats@offog.org>
Upstream-Status: Backport
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
configure.ac | 19 +++++++------------
meson.build | 10 +++++-----
2 files changed, 12 insertions(+), 17 deletions(-)
diff --git a/configure.ac b/configure.ac
index 40f5a583..29890622 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,19 +146,14 @@ if test "$os_unix" = "yes"; then
AC_CHECK_FUNC(
[strerror_r],
- [AC_RUN_IFELSE(
- [AC_LANG_SOURCE([[
- #include <errno.h>
- #include <string.h>
-
- int main (void)
- {
- char buf[32];
- return strerror_r (EINVAL, buf, 32);
- }
- ]])],
- [AC_DEFINE([HAVE_XSI_STRERROR_R], 1, [Whether XSI-compliant strerror_r() is available])],
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM([[#include <errno.h>
+ #include <string.h>]],
+ [[/* GNU strerror_r returns char *, XSI returns int */
+ char buf[32];
+ return *strerror_r (EINVAL, buf, 32);]])],
[AC_DEFINE([HAVE_GNU_STRERROR_R], 1, [Whether GNU-specific strerror_r() is available])],
+ [AC_DEFINE([HAVE_XSI_STRERROR_R], 1, [Whether XSI-compliant strerror_r() is available])],
[])],
[])
diff --git a/meson.build b/meson.build
index 0f8c8da0..4cc3f89a 100644
--- a/meson.build
+++ b/meson.build
@@ -306,15 +306,15 @@ if cc.has_function('strerror_r', prefix: '#include <string.h>')
int main (void)
{
+ /* GNU strerror_r returns char *, XSI returns int */
char buf[32];
- return strerror_r (EINVAL, buf, 32);
+ return *strerror_r (EINVAL, buf, 32);
}
'''
- strerror_r_check = cc.run(strerror_r_code, name : 'strerror_r check')
- if strerror_r_check.returncode() == 0
- conf.set('HAVE_XSI_STRERROR_R', 1)
- else
+ if cc.compiles(strerror_r_code, name : 'GNU strerror_r check')
conf.set('HAVE_GNU_STRERROR_R', 1)
+ else
+ conf.set('HAVE_XSI_STRERROR_R', 1)
endif
endif

30
meta/recipes-support/p11-kit/files/strerror-2.patch Normal file
View File

@@ -0,0 +1,30 @@
From 7aa6251bf4ce36d027d53c9c96bb05f90ef7eb5b Mon Sep 17 00:00:00 2001
From: Adam Sampson <ats@offog.org>
Date: Sun, 2 Jul 2023 15:44:06 +0100
Subject: [PATCH] Define _GNU_SOURCE when testing for strerror_r
The Meson check for GNU/XSI strerror_r didn't inherit the project
options that include _GNU_SOURCE (unlike the autoconf version), so the
result didn't match how the code that uses it will be compiled. Add
_GNU_SOURCE explicitly as with the following checks.
Signed-off-by: Adam Sampson <ats@offog.org>
Upstream-Status: Backport
Signed-off-by: Ross Burton <ross.burton@arm.com>
---
meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/meson.build b/meson.build
index 4cc3f89a..9a72e148 100644
--- a/meson.build
+++ b/meson.build
@@ -301,6 +301,7 @@ endforeach
if cc.has_function('strerror_r', prefix: '#include <string.h>')
strerror_r_code = '''
+#define _GNU_SOURCE
#include <errno.h>
#include <string.h>

4
meta/recipes-support/p11-kit/p11-kit_0.25.0.bb
View File

@@ -10,7 +10,9 @@ DEPENDS = "libtasn1 libtasn1-native libffi"
DEPENDS:append = "${@' glib-2.0' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}"
SRC_URI = "git://github.com/p11-glue/p11-kit;branch=master;protocol=https"
SRC_URI = "git://github.com/p11-glue/p11-kit;branch=master;protocol=https \
file://strerror-1.patch \
file://strerror-2.patch"
SRCREV = "a8cce8bd8065bbf80bd47219f85f0cd9cf27dd0c"
S = "${WORKDIR}/git"