summaryrefslogtreecommitdiffstats
path: root/meta/recipes-support/libgcrypt/files
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-support/libgcrypt/files')
-rw-r--r--meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch17
-rw-r--r--meta/recipes-support/libgcrypt/files/0001-tests-Fix-link-errors-for-t-thread-local.patch34
-rw-r--r--meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch39
-rw-r--r--meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch9
-rw-r--r--meta/recipes-support/libgcrypt/files/no-bench-slope.patch18
-rw-r--r--meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch10
6 files changed, 68 insertions, 59 deletions
diff --git a/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch b/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch
index cbfa30f0ad..7b840644d4 100644
--- a/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch
+++ b/meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch
@@ -1,4 +1,4 @@
1From bcfd89abdb5110b93314297120412d4c7f2da313 Mon Sep 17 00:00:00 2001 1From fcb53181b18c00083a8b08625db74829cfd6b4b2 Mon Sep 17 00:00:00 2001
2From: Trevor Gamblin <trevor.gamblin@windriver.com> 2From: Trevor Gamblin <trevor.gamblin@windriver.com>
3Date: Tue, 29 Oct 2019 14:08:32 -0400 3Date: Tue, 29 Oct 2019 14:08:32 -0400
4Subject: [PATCH] libgcrypt: fix m4 file for oe-core 4Subject: [PATCH] libgcrypt: fix m4 file for oe-core
@@ -11,19 +11,18 @@ settings.
11Upstream-Status: Inappropriate [oe-specific] 11Upstream-Status: Inappropriate [oe-specific]
12 12
13Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com> 13Signed-off-by: Trevor Gamblin <trevor.gamblin@windriver.com>
14
15--- 14---
16 src/libgcrypt.m4 | 90 +++--------------------------------------------- 15 src/libgcrypt.m4 | 90 +++---------------------------------------------
17 1 file changed, 4 insertions(+), 86 deletions(-) 16 1 file changed, 4 insertions(+), 86 deletions(-)
18 17
19diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4 18diff --git a/src/libgcrypt.m4 b/src/libgcrypt.m4
20index cd4249e..e53a36f 100644 19index 353df81..b195e22 100644
21--- a/src/libgcrypt.m4 20--- a/src/libgcrypt.m4
22+++ b/src/libgcrypt.m4 21+++ b/src/libgcrypt.m4
23@@ -29,41 +29,6 @@ dnl is added to the gpg_config_script_warn variable. 22@@ -116,41 +116,6 @@ dnl
24 dnl
25 AC_DEFUN([AM_PATH_LIBGCRYPT], 23 AC_DEFUN([AM_PATH_LIBGCRYPT],
26 [ AC_REQUIRE([AC_CANONICAL_HOST]) 24 [ AC_REQUIRE([AC_CANONICAL_HOST])dnl
25 AC_REQUIRE([_AM_PATH_GPGRT_CONFIG])dnl
27- AC_ARG_WITH(libgcrypt-prefix, 26- AC_ARG_WITH(libgcrypt-prefix,
28- AS_HELP_STRING([--with-libgcrypt-prefix=PFX], 27- AS_HELP_STRING([--with-libgcrypt-prefix=PFX],
29- [prefix where LIBGCRYPT is installed (optional)]), 28- [prefix where LIBGCRYPT is installed (optional)]),
@@ -62,7 +61,7 @@ index cd4249e..e53a36f 100644
62 61
63 tmp=ifelse([$1], ,1:1.2.0,$1) 62 tmp=ifelse([$1], ,1:1.2.0,$1)
64 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then 63 if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then
65@@ -74,56 +39,13 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], 64@@ -161,56 +126,13 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
66 min_libgcrypt_version="$tmp" 65 min_libgcrypt_version="$tmp"
67 fi 66 fi
68 67
@@ -122,7 +121,7 @@ index cd4249e..e53a36f 100644
122 if test "$tmp" -gt 0 ; then 121 if test "$tmp" -gt 0 ; then
123 AC_MSG_CHECKING([LIBGCRYPT API version]) 122 AC_MSG_CHECKING([LIBGCRYPT API version])
124 if test "$req_libgcrypt_api" -eq "$tmp" ; then 123 if test "$req_libgcrypt_api" -eq "$tmp" ; then
125@@ -136,11 +58,9 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], 124@@ -223,11 +145,9 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
126 fi 125 fi
127 fi 126 fi
128 if test $ok = yes; then 127 if test $ok = yes; then
@@ -135,7 +134,7 @@ index cd4249e..e53a36f 100644
135 else 134 else
136 libgcrypt_config_host=`$LIBGCRYPT_CONFIG --variable=host 2>/dev/null || echo none` 135 libgcrypt_config_host=`$LIBGCRYPT_CONFIG --variable=host 2>/dev/null || echo none`
137 fi 136 fi
138@@ -158,8 +78,6 @@ AC_DEFUN([AM_PATH_LIBGCRYPT], 137@@ -245,8 +165,6 @@ AC_DEFUN([AM_PATH_LIBGCRYPT],
139 fi 138 fi
140 fi 139 fi
141 else 140 else
diff --git a/meta/recipes-support/libgcrypt/files/0001-tests-Fix-link-errors-for-t-thread-local.patch b/meta/recipes-support/libgcrypt/files/0001-tests-Fix-link-errors-for-t-thread-local.patch
new file mode 100644
index 0000000000..5ebc3831d4
--- /dev/null
+++ b/meta/recipes-support/libgcrypt/files/0001-tests-Fix-link-errors-for-t-thread-local.patch
@@ -0,0 +1,34 @@
1From 746dc1c3837546c1085102e546a83da8d1c773e1 Mon Sep 17 00:00:00 2001
2From: Collin Funk <collin.funk1@gmail.com>
3Date: Thu, 1 May 2025 22:20:58 -0700
4Subject: [PATCH] tests: Fix link errors for t-thread-local.
5
6On platforms where pthread_create is not in libc t-thread-local fails to
7link. Issue found on NetBSD 10.0.
8* tests/Makefile.am (t_thread_local_LDADD): Add $(standard_ldadd),
9$(GPG_ERROR_MT_LIBS), and @LDADD_FOR_TESTS_KLUDGE@.
10(t_thread_local_CFLAGS): Add $(GPG_ERROR_MT_CFLAGS).
11
12--
13
14Upstream-Status: Backport [793eda7b258a562757b51c96044b103b638f1a63]
15GnuPG-bug-id: 7634
16Signed-off-by: Collin Funk <collin.funk1@gmail.com>
17Signed-off-by: Hiago De Franco <hiago.franco@toradex.com>
18---
19 tests/Makefile.am | 2 ++
20 1 file changed, 2 insertions(+)
21
22diff --git a/tests/Makefile.am b/tests/Makefile.am
23index 9a9e1c2c264a..b80f266f97c2 100644
24--- a/tests/Makefile.am
25+++ b/tests/Makefile.am
26@@ -94,6 +94,8 @@ t_secmem_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@
27 testapi_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@
28 t_lock_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@
29 t_lock_CFLAGS = $(GPG_ERROR_MT_CFLAGS) -lpthread
30+t_thread_local_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@
31+t_thread_local_CFLAGS = $(GPG_ERROR_MT_CFLAGS) -lpthread
32 testdrv_LDADD = $(LDADD_FOR_TESTS_KLUDGE)
33
34 # Build a version of the test driver for the build platform.
diff --git a/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch b/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch
deleted file mode 100644
index cf9ebfb3e6..0000000000
--- a/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From 0f66e796a8522e1043dda03b88d5f6feae839d16 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 16 Aug 2017 10:44:41 +0800
4Subject: [PATCH] libgcrypt: fix building error with '-O2' in sysroot path
5
6Upstream-Status: Pending
7
8Characters like '-O2' or '-Ofast' will be replaced by '-O1' when
9compiling cipher.
10If we are cross compiling libgcrypt and sysroot contains such
11characters, we would
12get compile errors because the sysroot path has been modified.
13
14Fix this by adding blank spaces before and after the original matching
15pattern in the
16sed command.
17
18Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
19
20Rebase to 1.8.0
21Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
22
23---
24 cipher/Makefile.am | 2 +-
25 1 file changed, 1 insertion(+), 1 deletion(-)
26
27diff --git a/cipher/Makefile.am b/cipher/Makefile.am
28index c3d642b..88c883a 100644
29--- a/cipher/Makefile.am
30+++ b/cipher/Makefile.am
31@@ -153,7 +153,7 @@ gost-s-box: gost-s-box.c
32
33
34 if ENABLE_O_FLAG_MUNGING
35-o_flag_munging = sed -e 's/-O\([2-9sgz][2-9sgz]*\)/-O1/' -e 's/-Ofast/-O1/g'
36+o_flag_munging = sed -e 's/ -O\([2-9sgz][2-9sgz]*\) / -O1 /' -e 's/ -Ofast / -O1 /g'
37 else
38 o_flag_munging = cat
39 endif
diff --git a/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch b/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch
index 4233fa7877..ccf4e18910 100644
--- a/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch
+++ b/meta/recipes-support/libgcrypt/files/0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch
@@ -1,4 +1,4 @@
1From 9182bc2dc676858a823c477d8f45a578b8c4f69f Mon Sep 17 00:00:00 2001 1From c7a99e7a15f1f703ac90fc2a16b2c2115a66a996 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Sun, 12 Jun 2016 04:44:29 -0400 3Date: Sun, 12 Jun 2016 04:44:29 -0400
4Subject: [PATCH] tests/Makefile.am: fix undefined reference to 4Subject: [PATCH] tests/Makefile.am: fix undefined reference to
@@ -9,16 +9,15 @@ Add missing '-lpthread' to CFLAGS
9Upstream-Status: Pending 9Upstream-Status: Pending
10 10
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12
13--- 12---
14 tests/Makefile.am | 4 ++-- 13 tests/Makefile.am | 4 ++--
15 1 file changed, 2 insertions(+), 2 deletions(-) 14 1 file changed, 2 insertions(+), 2 deletions(-)
16 15
17diff --git a/tests/Makefile.am b/tests/Makefile.am 16diff --git a/tests/Makefile.am b/tests/Makefile.am
18index e6953fd..f47e1d3 100644 17index 3170a58..9a9e1c2 100644
19--- a/tests/Makefile.am 18--- a/tests/Makefile.am
20+++ b/tests/Makefile.am 19+++ b/tests/Makefile.am
21@@ -76,7 +76,7 @@ t_mpi_bit_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@ 20@@ -93,7 +93,7 @@ t_mpi_bit_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@
22 t_secmem_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@ 21 t_secmem_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@
23 testapi_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@ 22 testapi_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@
24 t_lock_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@ 23 t_lock_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@
@@ -27,7 +26,7 @@ index e6953fd..f47e1d3 100644
27 testdrv_LDADD = $(LDADD_FOR_TESTS_KLUDGE) 26 testdrv_LDADD = $(LDADD_FOR_TESTS_KLUDGE)
28 27
29 # Build a version of the test driver for the build platform. 28 # Build a version of the test driver for the build platform.
30@@ -95,7 +95,7 @@ else 29@@ -112,7 +112,7 @@ else
31 xtestsuite_libs = ../src/.libs/libgcrypt.so* 30 xtestsuite_libs = ../src/.libs/libgcrypt.so*
32 xtestsuite_driver = testdrv 31 xtestsuite_driver = testdrv
33 t_kdf_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@ 32 t_kdf_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@
diff --git a/meta/recipes-support/libgcrypt/files/no-bench-slope.patch b/meta/recipes-support/libgcrypt/files/no-bench-slope.patch
index 8de3c6713b..44aac1913e 100644
--- a/meta/recipes-support/libgcrypt/files/no-bench-slope.patch
+++ b/meta/recipes-support/libgcrypt/files/no-bench-slope.patch
@@ -1,3 +1,8 @@
1From eb3a5bc4d5a212da64c0f9396c7f31f83aa6f36c Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@arm.com>
3Date: Fri, 9 Sep 2022 11:13:37 +0100
4Subject: [PATCH] libgcrypt: disable bench-slope test case
5
1The bench-slope test appears to be aborting fairly frequently, which causes 6The bench-slope test appears to be aborting fairly frequently, which causes
2failures on the autobuilder. 7failures on the autobuilder.
3 8
@@ -5,16 +10,19 @@ Until this has been root-caused, disable the test.
5 10
6Upstream-Status: Inappropriate 11Upstream-Status: Inappropriate
7Signed-off-by: Ross Burton <ross.burton@arm.com> 12Signed-off-by: Ross Burton <ross.burton@arm.com>
13---
14 tests/testdrv.c | 1 -
15 1 file changed, 1 deletion(-)
8 16
9diff --git a/tests/testdrv.c b/tests/testdrv.c 17diff --git a/tests/testdrv.c b/tests/testdrv.c
10index 0ccde326..d3455186 100644 18index 634b718..1e9dddb 100644
11--- a/tests/testdrv.c 19--- a/tests/testdrv.c
12+++ b/tests/testdrv.c 20+++ b/tests/testdrv.c
13@@ -77,7 +77,6 @@ static struct { 21@@ -76,7 +76,6 @@ static struct {
14 { "t-x448" }, 22 { "t-x448" },
15 { "t-ed448" }, 23 { "t-ed448" },
16 { "benchmark" }, 24 { "benchmark" },
17- { "bench-slope" }, 25- { "bench-slope" },
18 { "hashtest-256g", "hashtest", "--gigs 256 SHA1 SHA256 SHA512 SM3", 26 { "hashtest-6g", "hashtest", "--hugeblock --gigs 6 SHA1 SHA256 SHA512 "
19 LONG_RUNNING }, 27 "SHA3-512 SM3 BLAKE2S_256 "
20 { NULL } 28 "BLAKE2B_512 CRC32 "
diff --git a/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch b/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch
index b9a607863d..98874ce12a 100644
--- a/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch
+++ b/meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch
@@ -1,11 +1,19 @@
1From ede03b847038afc294e206ca345d12d75bbba844 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@arm.com>
3Date: Fri, 26 Aug 2022 15:23:37 +0100
4Subject: [PATCH] libgcrypt: rewrite ptest
5
1Don't depend on a native libgpg-error to build the test driver, as it's 6Don't depend on a native libgpg-error to build the test driver, as it's
2an optional dependency for some C annotations. 7an optional dependency for some C annotations.
3 8
4Upstream-Status: Inappropriate 9Upstream-Status: Inappropriate
5Signed-off-by: Ross Burton <ross.burton@arm.com> 10Signed-off-by: Ross Burton <ross.burton@arm.com>
11---
12 tests/testdrv.c | 1 -
13 1 file changed, 1 deletion(-)
6 14
7diff --git a/tests/testdrv.c b/tests/testdrv.c 15diff --git a/tests/testdrv.c b/tests/testdrv.c
8index 0ccde326..6d6abd57 100644 16index bfca4c2..634b718 100644
9--- a/tests/testdrv.c 17--- a/tests/testdrv.c
10+++ b/tests/testdrv.c 18+++ b/tests/testdrv.c
11@@ -32,7 +32,6 @@ 19@@ -32,7 +32,6 @@
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-07-05 22:41:00 +0000