1
0
mirror of https://git.yoctoproject.org/poky synced 2026-05-08 17:19:20 +00:00

nettle: upgrade 3.5.1 -> 3.6

refresh the following patches:
Add-target-to-only-build-tests-not-run-them.patch
dlopen-test.patch

(From OE-Core rev: cf4c4c65df5349b60895525418954281b3140173)

Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Wang Mingyu
2020-05-12 18:10:34 +08:00
committed by Richard Purdie
parent f63e51a165
commit e12098a612
5 changed files with 33 additions and 18 deletions
@@ -8,12 +8,16 @@ Upstream-Status: Inappropriate [not a complete solution]
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Refactored for 3.4
Signed-off-by: Armin Kuster <akuster@mvista.com>
---
Makefile.in | 3 +++
testsuite/Makefile.in | 2 ++
2 files changed, 5 insertions(+)
Index: nettle-3.4/Makefile.in
===================================================================
--- nettle-3.4.orig/Makefile.in
+++ nettle-3.4/Makefile.in
@@ -55,6 +55,9 @@ clean distclean mostlyclean maintainer-c
diff --git a/Makefile.in b/Makefile.in
index e5ccfc7..15c9275 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -52,6 +52,9 @@ clean distclean mostlyclean maintainer-clean tags:
echo "Making $@ in $$d" ; (cd $$d && $(MAKE) $@); done
$(MAKE) $@-here
@@ -23,16 +27,19 @@ Index: nettle-3.4/Makefile.in
check-here:
true
Index: nettle-3.4/testsuite/Makefile.in
===================================================================
--- nettle-3.4.orig/testsuite/Makefile.in
+++ nettle-3.4/testsuite/Makefile.in
@@ -131,6 +131,8 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$
diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in
index 3f5e5f6..8fd68a3 100644
--- a/testsuite/Makefile.in
+++ b/testsuite/Makefile.in
@@ -122,6 +122,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
+buildtest: $(TS_ALL)
+
# The PATH update is for windows dlls, DYLD_LIBRARY_PATH is for OSX.
check: $(TS_ALL)
LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" DYLD_LIBRARY_PATH=../.lib \
TEST_SHLIB_DIR="$(TEST_SHLIB_DIR)" \
srcdir="$(srcdir)" \
--
2.17.1
@@ -7,15 +7,23 @@ Upstream-Status: Inappropriate [embedded specific]
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
---
testsuite/dlopen-test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/testsuite/dlopen-test.c 2016-10-01 00:28:38.000000000 -0700
+++ b/testsuite/dlopen-test.c 2017-10-13 11:08:57.227572860 -0700
@@ -9,7 +9,7 @@
diff --git a/testsuite/dlopen-test.c b/testsuite/dlopen-test.c
index 4265bf7..1a25d17 100644
--- a/testsuite/dlopen-test.c
+++ b/testsuite/dlopen-test.c
@@ -15,7 +15,7 @@ int
main (int argc UNUSED, char **argv UNUSED)
{
#if HAVE_LIBDL
- void *handle = dlopen ("../libnettle.so", RTLD_NOW);
- void *handle = dlopen ("../libnettle." SO_EXT, RTLD_NOW);
+ void *handle = dlopen ("libnettle.so", RTLD_NOW);
int (*get_version)(void);
if (!handle)
{
--
2.17.1
@@ -20,8 +20,8 @@ SRC_URI_append_class-target = "\
file://dlopen-test.patch \
"
SRC_URI[md5sum] = "0e5707b418c3826768d41130fbe4ee86"
SRC_URI[sha256sum] = "75cca1998761b02e16f2db56da52992aef622bf55a3b45ec538bc2eedadc9419"
SRC_URI[md5sum] = "c45ee24ed7361dcda152a035d396fe8a"
SRC_URI[sha256sum] = "d24c0d0f2abffbc8f4f34dcf114b0f131ec3774895f3555922fe2f40f3d5e3f1"
UPSTREAM_CHECK_REGEX = "nettle-(?P<pver>\d+(\.\d+)+)\.tar"