From c591f97432047a2add48ff0ec9c20babba2915c6 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 16 Mar 2018 20:11:40 +0000 Subject: nettle: refresh the patches * fixes: WARNING: nettle-2.7.1-r0 do_patch: Some of the context lines in patches were ignored. This can lead to incorrectly applied patches. The context lines in the patches can be updated with devtool: devtool modify devtool finish --force-patch-refresh Then the updated patches and the source tree (in devtool's workspace) should be reviewed to make sure the patches apply in the correct place and don't introduce duplicate lines (which can, and does happen when some of the context is ignored). Further information: http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450 Details: Applying patch Add-target-to-only-build-tests-not-run-them.patch patching file Makefile.in Hunk #1 succeeded at 53 (offset -2 lines). patching file testsuite/Makefile.in Hunk #1 succeeded at 105 with fuzz 2 (offset -11 lines). Now at patch Add-target-to-only-build-tests-not-run-them.patch Signed-off-by: Martin Jansa Signed-off-by: Ross Burton --- .../Add-target-to-only-build-tests-not-run-them.patch | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch') diff --git a/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch b/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch index 23da777..af77aec 100644 --- a/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch +++ b/recipes-support/nettle/files/Add-target-to-only-build-tests-not-run-them.patch @@ -1,4 +1,4 @@ -From 46edf01cc98db9f9feec984897836dfdd26bdc8d Mon Sep 17 00:00:00 2001 +From 9225dfb91b6b5617cf2dff32d370cf027237d4c8 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Wed, 12 Aug 2015 23:27:27 +0300 Subject: [PATCH] Add target to only build tests (not run them) @@ -9,16 +9,17 @@ installable tests: It's useful for us already as is. Upstream-Status: Inappropriate [not a complete solution] Signed-off-by: Jussi Kukkonen + --- Makefile.in | 3 +++ testsuite/Makefile.in | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Makefile.in b/Makefile.in -index 08efb7d..7909342 100644 +index 2c25007..ef21b1b 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -55,6 +55,9 @@ clean distclean mostlyclean maintainer-clean tags: +@@ -53,6 +53,9 @@ clean distclean mostlyclean maintainer-clean tags: echo "Making $@ in $$d" ; (cd $$d && $(MAKE) $@); done $(MAKE) $@-here @@ -29,18 +30,15 @@ index 08efb7d..7909342 100644 true diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in -index 6bc1907..bb65bf0 100644 +index 91f6e2a..52f5c29 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in -@@ -116,6 +116,8 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \ - # data. - VALGRIND = valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes @IF_ASM@ --partial-loads-ok=yes +@@ -105,6 +105,8 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \ + + VALGRIND = valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes +buildtest: $(TS_ALL) + # The PATH update is for locating dlls on w*ndows. check: $(TS_ALL) LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" srcdir="$(srcdir)" \ --- -2.1.4 - -- cgit v1.2.3-54-g00ecf