Switch to gitsm:// to fetch https://github.com/p11-glue/pkcs11-json.git as a submodule (otherwise meson will try to do that in do_configure).
Signed-off-by: Alexander Kanavin <[email protected]> --- .../p11-kit/files/strerror-1.patch | 76 ------------------- .../p11-kit/files/strerror-2.patch | 30 -------- .../{p11-kit_0.25.0.bb => p11-kit_0.25.2.bb} | 6 +- 3 files changed, 2 insertions(+), 110 deletions(-) delete mode 100644 meta/recipes-support/p11-kit/files/strerror-1.patch delete mode 100644 meta/recipes-support/p11-kit/files/strerror-2.patch rename meta/recipes-support/p11-kit/{p11-kit_0.25.0.bb => p11-kit_0.25.2.bb} (85%) 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 6af4fee7249..00000000000 --- a/meta/recipes-support/p11-kit/files/strerror-1.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 3ba2c55dfdc8ff20de369f07f6c57d08718d3add Mon Sep 17 00:00:00 2001 -From: Adam Sampson <[email protected]> -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 <[email protected]> - -Upstream-Status: Backport -Signed-off-by: Ross Burton <[email protected]> ---- - 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 - diff --git a/meta/recipes-support/p11-kit/files/strerror-2.patch b/meta/recipes-support/p11-kit/files/strerror-2.patch deleted file mode 100644 index 1a9180b508c..00000000000 --- a/meta/recipes-support/p11-kit/files/strerror-2.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 7aa6251bf4ce36d027d53c9c96bb05f90ef7eb5b Mon Sep 17 00:00:00 2001 -From: Adam Sampson <[email protected]> -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 <[email protected]> - -Upstream-Status: Backport -Signed-off-by: Ross Burton <[email protected]> ---- - 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> - diff --git a/meta/recipes-support/p11-kit/p11-kit_0.25.0.bb b/meta/recipes-support/p11-kit/p11-kit_0.25.2.bb similarity index 85% rename from meta/recipes-support/p11-kit/p11-kit_0.25.0.bb rename to meta/recipes-support/p11-kit/p11-kit_0.25.2.bb index ad1fda3f3b7..d00ef2daf55 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.25.0.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.25.2.bb @@ -10,10 +10,8 @@ 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 \ - file://strerror-1.patch \ - file://strerror-2.patch" -SRCREV = "a8cce8bd8065bbf80bd47219f85f0cd9cf27dd0c" +SRC_URI = "gitsm://github.com/p11-glue/p11-kit;branch=master;protocol=https" +SRCREV = "66d6b42ef8dd84fcd8e199ac9f23f822f1a058c9" S = "${WORKDIR}/git" PACKAGECONFIG ??= "" -- 2.39.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#191282): https://lists.openembedded.org/g/openembedded-core/message/191282 Mute This Topic: https://lists.openembedded.org/mt/102826382/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
