diff options
Diffstat (limited to 'meta/recipes-support/libgcrypt/files')
2 files changed, 14 insertions, 46 deletions
diff --git a/meta/recipes-support/libgcrypt/files/0001-Makefile.am-add-a-missing-space.patch b/meta/recipes-support/libgcrypt/files/0001-Makefile.am-add-a-missing-space.patch deleted file mode 100644 index 62b7484e45..0000000000 --- a/meta/recipes-support/libgcrypt/files/0001-Makefile.am-add-a-missing-space.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From b8192ff67ed46ea2cc4282fa1856ce2868223737 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Wed, 24 Feb 2021 19:43:07 +0000 | ||
4 | Subject: [PATCH] Makefile.am: add a missing space | ||
5 | |||
6 | Upstream-Status: Submitted [by email to gniibe@fsij.org,gcrypt-devel@gnupg.org] | ||
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
8 | --- | ||
9 | cipher/Makefile.am | 2 +- | ||
10 | doc/Makefile.am | 2 +- | ||
11 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
12 | |||
13 | diff --git a/cipher/Makefile.am b/cipher/Makefile.am | ||
14 | index 1cf5072..b3ca225 100644 | ||
15 | --- a/cipher/Makefile.am | ||
16 | +++ b/cipher/Makefile.am | ||
17 | @@ -143,7 +143,7 @@ gost-sb.h: gost-s-box | ||
18 | |||
19 | gost-s-box: gost-s-box.c | ||
20 | $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \ | ||
21 | - $(CPPFLAGS_FOR_BUILD)-o $@ $(srcdir)/gost-s-box.c | ||
22 | + $(CPPFLAGS_FOR_BUILD) -o $@ $(srcdir)/gost-s-box.c | ||
23 | |||
24 | |||
25 | if ENABLE_O_FLAG_MUNGING | ||
26 | diff --git a/doc/Makefile.am b/doc/Makefile.am | ||
27 | index fd7aac2..1703bd9 100644 | ||
28 | --- a/doc/Makefile.am | ||
29 | +++ b/doc/Makefile.am | ||
30 | @@ -43,7 +43,7 @@ man_MANS = $(myman_pages) | ||
31 | |||
32 | yat2m: yat2m.c | ||
33 | $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) \ | ||
34 | - $(CPPFLAGS_FOR_BUILD)-o $@ $(srcdir)/yat2m.c | ||
35 | + $(CPPFLAGS_FOR_BUILD) -o $@ $(srcdir)/yat2m.c | ||
36 | |||
37 | .fig.png: | ||
38 | fig2dev -L png `test -f '$<' || echo '$(srcdir)/'`$< $@ | ||
39 | -- | ||
40 | 2.17.1 | ||
41 | |||
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 5bf0c7f8a3..4233fa7877 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 @@ | |||
1 | From cb06d218ee36e303a64f27c690f30040d5d87960 Mon Sep 17 00:00:00 2001 | 1 | From 9182bc2dc676858a823c477d8f45a578b8c4f69f Mon Sep 17 00:00:00 2001 |
2 | From: Hongxu Jia <hongxu.jia@windriver.com> | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
3 | Date: Sun, 12 Jun 2016 04:44:29 -0400 | 3 | Date: Sun, 12 Jun 2016 04:44:29 -0400 |
4 | Subject: [PATCH] tests/Makefile.am: fix undefined reference to | 4 | Subject: [PATCH] tests/Makefile.am: fix undefined reference to |
@@ -11,14 +11,14 @@ Upstream-Status: Pending | |||
11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> | 11 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
12 | 12 | ||
13 | --- | 13 | --- |
14 | tests/Makefile.am | 2 +- | 14 | tests/Makefile.am | 4 ++-- |
15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 15 | 1 file changed, 2 insertions(+), 2 deletions(-) |
16 | 16 | ||
17 | diff --git a/tests/Makefile.am b/tests/Makefile.am | 17 | diff --git a/tests/Makefile.am b/tests/Makefile.am |
18 | index ab201f0..1cf82d0 100644 | 18 | index e6953fd..f47e1d3 100644 |
19 | --- a/tests/Makefile.am | 19 | --- a/tests/Makefile.am |
20 | +++ b/tests/Makefile.am | 20 | +++ b/tests/Makefile.am |
21 | @@ -75,7 +75,7 @@ t_mpi_bit_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@ | 21 | @@ -76,7 +76,7 @@ t_mpi_bit_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@ |
22 | t_secmem_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@ | 22 | t_secmem_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@ |
23 | testapi_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@ | 23 | testapi_LDADD = $(standard_ldadd) @LDADD_FOR_TESTS_KLUDGE@ |
24 | t_lock_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@ | 24 | t_lock_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@ |
@@ -27,3 +27,12 @@ index ab201f0..1cf82d0 100644 | |||
27 | testdrv_LDADD = $(LDADD_FOR_TESTS_KLUDGE) | 27 | testdrv_LDADD = $(LDADD_FOR_TESTS_KLUDGE) |
28 | 28 | ||
29 | # Build a version of the test driver for the build platform. | 29 | # Build a version of the test driver for the build platform. |
30 | @@ -95,7 +95,7 @@ else | ||
31 | xtestsuite_libs = ../src/.libs/libgcrypt.so* | ||
32 | xtestsuite_driver = testdrv | ||
33 | t_kdf_LDADD = $(standard_ldadd) $(GPG_ERROR_MT_LIBS) @LDADD_FOR_TESTS_KLUDGE@ | ||
34 | -t_kdf_CFLAGS = $(GPG_ERROR_MT_CFLAGS) | ||
35 | +t_kdf_CFLAGS = $(GPG_ERROR_MT_CFLAGS) -lpthread | ||
36 | endif | ||
37 | |||
38 | # xcheck uses our new testdrv instead of the automake test runner. | ||