summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/recipes-support/libgcrypt/files/0001-libgcrypt-fix-m4-file-for-oe-core.patch8
-rw-r--r--meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch49
-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.patch10
-rw-r--r--meta/recipes-support/libgcrypt/files/no-native-gpg-error.patch10
-rw-r--r--meta/recipes-support/libgcrypt/libgcrypt_1.11.1.bb (renamed from meta/recipes-support/libgcrypt/libgcrypt_1.11.0.bb)3
6 files changed, 23 insertions, 66 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 9615611f6e..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,13 +11,12 @@ 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 353df81b6d..b195e22894 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@@ -116,41 +116,6 @@ dnl 22@@ -116,41 +116,6 @@ dnl
@@ -144,6 +143,3 @@ index 353df81b6d..b195e22894 100644
144 ifelse([$3], , :, [$3]) 143 ifelse([$3], , :, [$3])
145 fi 144 fi
146 AC_SUBST(LIBGCRYPT_CFLAGS) 145 AC_SUBST(LIBGCRYPT_CFLAGS)
147--
1482.34.1
149
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 78b02eda9d..0000000000
--- a/meta/recipes-support/libgcrypt/files/0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From e96df0c82e086bf348753d2d0fa37fa6191b4b14 Mon Sep 17 00:00:00 2001
2From: "simit.ghane" <simit.ghane@lge.com>
3Date: Tue, 11 Jun 2024 07:22:28 +0530
4Subject: [PATCH] random:cipher: handle substitution in sed command
5
6Upstream-Status: Backport [https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=e96df0c82e086bf348753d2d0fa37fa6191b4b14]
7
8* cipher/Makefile.am (o_flag_munging): Add 'g' flag for first sed
9expression.
10* random/Makefile.am (o_flag_munging): Likewise.
11--
12
13It was there earlier and accidentally removed from
14Makefile.am of cipher and random
15
16Signed-off-by: simit.ghane <simit.ghane@lge.com>
17[jk: add changelog to commit message]
18Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
19---
20 cipher/Makefile.am | 2 +-
21 random/Makefile.am | 2 +-
22 2 files changed, 2 insertions(+), 2 deletions(-)
23
24diff --git a/cipher/Makefile.am b/cipher/Makefile.am
25index ea9014cc98..149c9f2101 100644
26--- a/cipher/Makefile.am
27+++ b/cipher/Makefile.am
28@@ -169,7 +169,7 @@ gost-s-box$(EXEEXT_FOR_BUILD): gost-s-box.c
29
30
31 if ENABLE_O_FLAG_MUNGING
32-o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /' -e 's/[[:blank:]]-Ofast/ -O1 /g'
33+o_flag_munging = sed -e 's/[[:blank:]]-O\([2-9sgz][2-9sgz]*\)/ -O1 /g' -e 's/[[:blank:]]-Ofast/ -O1 /g'
34 else
35 o_flag_munging = cat
36 endif
37diff --git a/random/Makefile.am b/random/Makefile.am
38index c7100ef8b8..a42e430649 100644
39--- a/random/Makefile.am
40+++ b/random/Makefile.am
41@@ -56,7 +56,7 @@ jitterentropy-base.c jitterentropy.h jitterentropy-base-user.h
42
43 # The rndjent module needs to be compiled without optimization. */
44 if ENABLE_O_FLAG_MUNGING
45-o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /' -e 's/[[:blank:]]-Ofast/ -O0 /g'
46+o_flag_munging = sed -e 's/[[:blank:]]-O\([1-9sgz][1-9sgz]*\)/ -O0 /g' -e 's/[[:blank:]]-Ofast/ -O0 /g'
47 else
48 o_flag_munging = cat
49 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 ed65ed4e67..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
@@ -10,10 +15,10 @@ Signed-off-by: Ross Burton <ross.burton@arm.com>
10 1 file changed, 1 deletion(-) 15 1 file changed, 1 deletion(-)
11 16
12diff --git a/tests/testdrv.c b/tests/testdrv.c 17diff --git a/tests/testdrv.c b/tests/testdrv.c
13index bfca4c2314..5a755f512e 100644 18index 634b718..1e9dddb 100644
14--- a/tests/testdrv.c 19--- a/tests/testdrv.c
15+++ b/tests/testdrv.c 20+++ b/tests/testdrv.c
16@@ -77,7 +77,6 @@ static struct { 21@@ -76,7 +76,6 @@ static struct {
17 { "t-x448" }, 22 { "t-x448" },
18 { "t-ed448" }, 23 { "t-ed448" },
19 { "benchmark" }, 24 { "benchmark" },
@@ -21,4 +26,3 @@ index bfca4c2314..5a755f512e 100644
21 { "hashtest-6g", "hashtest", "--hugeblock --gigs 6 SHA1 SHA256 SHA512 " 26 { "hashtest-6g", "hashtest", "--hugeblock --gigs 6 SHA1 SHA256 SHA512 "
22 "SHA3-512 SM3 BLAKE2S_256 " 27 "SHA3-512 SM3 BLAKE2S_256 "
23 "BLAKE2B_512 CRC32 " 28 "BLAKE2B_512 CRC32 "
24
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 @@
diff --git a/meta/recipes-support/libgcrypt/libgcrypt_1.11.0.bb b/meta/recipes-support/libgcrypt/libgcrypt_1.11.1.bb
index ea1f34e8ce..e51a20e5bf 100644
--- a/meta/recipes-support/libgcrypt/libgcrypt_1.11.0.bb
+++ b/meta/recipes-support/libgcrypt/libgcrypt_1.11.1.bb
@@ -20,13 +20,12 @@ DEPENDS = "libgpg-error"
20UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html" 20UPSTREAM_CHECK_URI = "https://gnupg.org/download/index.html"
21SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \ 21SRC_URI = "${GNUPG_MIRROR}/libgcrypt/libgcrypt-${PV}.tar.bz2 \
22 file://0001-libgcrypt-fix-m4-file-for-oe-core.patch \ 22 file://0001-libgcrypt-fix-m4-file-for-oe-core.patch \
23 file://0002-libgcrypt-fix-building-error-with-O2-in-sysroot-path.patch \
24 file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \ 23 file://0004-tests-Makefile.am-fix-undefined-reference-to-pthread.patch \
25 file://no-native-gpg-error.patch \ 24 file://no-native-gpg-error.patch \
26 file://no-bench-slope.patch \ 25 file://no-bench-slope.patch \
27 file://run-ptest \ 26 file://run-ptest \
28 " 27 "
29SRC_URI[sha256sum] = "09120c9867ce7f2081d6aaa1775386b98c2f2f246135761aae47d81f58685b9c" 28SRC_URI[sha256sum] = "24e91c9123a46c54e8371f3a3a2502f1198f2893fbfbf59af95bc1c21499b00e"
30 29
31BINCONFIG = "${bindir}/libgcrypt-config" 30BINCONFIG = "${bindir}/libgcrypt-config"
32 31
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-01-09 08:39:52 +0000