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