diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-support/nettle/nettle-3.6/Add-target-to-only-build-tests-not-run-them.patch (renamed from meta/recipes-support/nettle/nettle-3.5.1/Add-target-to-only-build-tests-not-run-them.patch) | 31 | ||||
-rw-r--r-- | meta/recipes-support/nettle/nettle-3.6/check-header-files-of-openssl-only-if-enable_.patch (renamed from meta/recipes-support/nettle/nettle-3.5.1/check-header-files-of-openssl-only-if-enable_.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-support/nettle/nettle-3.6/dlopen-test.patch (renamed from meta/recipes-support/nettle/nettle-3.5.1/dlopen-test.patch) | 16 | ||||
-rw-r--r-- | meta/recipes-support/nettle/nettle-3.6/run-ptest (renamed from meta/recipes-support/nettle/nettle-3.5.1/run-ptest) | 0 | ||||
-rw-r--r-- | meta/recipes-support/nettle/nettle_3.6.bb (renamed from meta/recipes-support/nettle/nettle_3.5.1.bb) | 4 |
5 files changed, 33 insertions, 18 deletions
diff --git a/meta/recipes-support/nettle/nettle-3.5.1/Add-target-to-only-build-tests-not-run-them.patch b/meta/recipes-support/nettle/nettle-3.6/Add-target-to-only-build-tests-not-run-them.patch index c007060ee6..e3f5c6de7d 100644 --- a/meta/recipes-support/nettle/nettle-3.5.1/Add-target-to-only-build-tests-not-run-them.patch +++ b/meta/recipes-support/nettle/nettle-3.6/Add-target-to-only-build-tests-not-run-them.patch | |||
@@ -8,12 +8,16 @@ Upstream-Status: Inappropriate [not a complete solution] | |||
8 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | 8 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
9 | Refactored for 3.4 | 9 | Refactored for 3.4 |
10 | Signed-off-by: Armin Kuster <akuster@mvista.com> | 10 | Signed-off-by: Armin Kuster <akuster@mvista.com> |
11 | --- | ||
12 | Makefile.in | 3 +++ | ||
13 | testsuite/Makefile.in | 2 ++ | ||
14 | 2 files changed, 5 insertions(+) | ||
11 | 15 | ||
12 | Index: nettle-3.4/Makefile.in | 16 | diff --git a/Makefile.in b/Makefile.in |
13 | =================================================================== | 17 | index e5ccfc7..15c9275 100644 |
14 | --- nettle-3.4.orig/Makefile.in | 18 | --- a/Makefile.in |
15 | +++ nettle-3.4/Makefile.in | 19 | +++ b/Makefile.in |
16 | @@ -55,6 +55,9 @@ clean distclean mostlyclean maintainer-c | 20 | @@ -52,6 +52,9 @@ clean distclean mostlyclean maintainer-clean tags: |
17 | echo "Making $@ in $$d" ; (cd $$d && $(MAKE) $@); done | 21 | echo "Making $@ in $$d" ; (cd $$d && $(MAKE) $@); done |
18 | $(MAKE) $@-here | 22 | $(MAKE) $@-here |
19 | 23 | ||
@@ -23,16 +27,19 @@ Index: nettle-3.4/Makefile.in | |||
23 | check-here: | 27 | check-here: |
24 | true | 28 | true |
25 | 29 | ||
26 | Index: nettle-3.4/testsuite/Makefile.in | 30 | diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in |
27 | =================================================================== | 31 | index 3f5e5f6..8fd68a3 100644 |
28 | --- nettle-3.4.orig/testsuite/Makefile.in | 32 | --- a/testsuite/Makefile.in |
29 | +++ nettle-3.4/testsuite/Makefile.in | 33 | +++ b/testsuite/Makefile.in |
30 | @@ -131,6 +131,8 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$ | 34 | @@ -122,6 +122,8 @@ $(TARGETS) $(EXTRA_TARGETS): testutils.$(OBJEXT) ../nettle-internal.$(OBJEXT) \ |
31 | # data. | 35 | # data. |
32 | VALGRIND = valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes @IF_ASM@ --partial-loads-ok=yes | 36 | VALGRIND = valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes @IF_ASM@ --partial-loads-ok=yes |
33 | 37 | ||
34 | +buildtest: $(TS_ALL) | 38 | +buildtest: $(TS_ALL) |
35 | + | 39 | + |
36 | # The PATH update is for windows dlls, DYLD_LIBRARY_PATH is for OSX. | ||
37 | check: $(TS_ALL) | 40 | check: $(TS_ALL) |
38 | LD_LIBRARY_PATH=../.lib PATH="../.lib:$$PATH" DYLD_LIBRARY_PATH=../.lib \ | 41 | TEST_SHLIB_DIR="$(TEST_SHLIB_DIR)" \ |
42 | srcdir="$(srcdir)" \ | ||
43 | -- | ||
44 | 2.17.1 | ||
45 | |||
diff --git a/meta/recipes-support/nettle/nettle-3.5.1/check-header-files-of-openssl-only-if-enable_.patch b/meta/recipes-support/nettle/nettle-3.6/check-header-files-of-openssl-only-if-enable_.patch index d5f266681e..d5f266681e 100644 --- a/meta/recipes-support/nettle/nettle-3.5.1/check-header-files-of-openssl-only-if-enable_.patch +++ b/meta/recipes-support/nettle/nettle-3.6/check-header-files-of-openssl-only-if-enable_.patch | |||
diff --git a/meta/recipes-support/nettle/nettle-3.5.1/dlopen-test.patch b/meta/recipes-support/nettle/nettle-3.6/dlopen-test.patch index fea5774206..ab9b91f88b 100644 --- a/meta/recipes-support/nettle/nettle-3.5.1/dlopen-test.patch +++ b/meta/recipes-support/nettle/nettle-3.6/dlopen-test.patch | |||
@@ -7,15 +7,23 @@ Upstream-Status: Inappropriate [embedded specific] | |||
7 | 7 | ||
8 | Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> | 8 | Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> |
9 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | 9 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
10 | --- | ||
11 | testsuite/dlopen-test.c | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
10 | 13 | ||
11 | --- a/testsuite/dlopen-test.c 2016-10-01 00:28:38.000000000 -0700 | 14 | diff --git a/testsuite/dlopen-test.c b/testsuite/dlopen-test.c |
12 | +++ b/testsuite/dlopen-test.c 2017-10-13 11:08:57.227572860 -0700 | 15 | index 4265bf7..1a25d17 100644 |
13 | @@ -9,7 +9,7 @@ | 16 | --- a/testsuite/dlopen-test.c |
17 | +++ b/testsuite/dlopen-test.c | ||
18 | @@ -15,7 +15,7 @@ int | ||
14 | main (int argc UNUSED, char **argv UNUSED) | 19 | main (int argc UNUSED, char **argv UNUSED) |
15 | { | 20 | { |
16 | #if HAVE_LIBDL | 21 | #if HAVE_LIBDL |
17 | - void *handle = dlopen ("../libnettle.so", RTLD_NOW); | 22 | - void *handle = dlopen ("../libnettle." SO_EXT, RTLD_NOW); |
18 | + void *handle = dlopen ("libnettle.so", RTLD_NOW); | 23 | + void *handle = dlopen ("libnettle.so", RTLD_NOW); |
19 | int (*get_version)(void); | 24 | int (*get_version)(void); |
20 | if (!handle) | 25 | if (!handle) |
21 | { | 26 | { |
27 | -- | ||
28 | 2.17.1 | ||
29 | |||
diff --git a/meta/recipes-support/nettle/nettle-3.5.1/run-ptest b/meta/recipes-support/nettle/nettle-3.6/run-ptest index b90bed66d2..b90bed66d2 100644 --- a/meta/recipes-support/nettle/nettle-3.5.1/run-ptest +++ b/meta/recipes-support/nettle/nettle-3.6/run-ptest | |||
diff --git a/meta/recipes-support/nettle/nettle_3.5.1.bb b/meta/recipes-support/nettle/nettle_3.6.bb index d92db0ef95..b71f56d83d 100644 --- a/meta/recipes-support/nettle/nettle_3.5.1.bb +++ b/meta/recipes-support/nettle/nettle_3.6.bb | |||
@@ -20,8 +20,8 @@ SRC_URI_append_class-target = "\ | |||
20 | file://dlopen-test.patch \ | 20 | file://dlopen-test.patch \ |
21 | " | 21 | " |
22 | 22 | ||
23 | SRC_URI[md5sum] = "0e5707b418c3826768d41130fbe4ee86" | 23 | SRC_URI[md5sum] = "c45ee24ed7361dcda152a035d396fe8a" |
24 | SRC_URI[sha256sum] = "75cca1998761b02e16f2db56da52992aef622bf55a3b45ec538bc2eedadc9419" | 24 | SRC_URI[sha256sum] = "d24c0d0f2abffbc8f4f34dcf114b0f131ec3774895f3555922fe2f40f3d5e3f1" |
25 | 25 | ||
26 | UPSTREAM_CHECK_REGEX = "nettle-(?P<pver>\d+(\.\d+)+)\.tar" | 26 | UPSTREAM_CHECK_REGEX = "nettle-(?P<pver>\d+(\.\d+)+)\.tar" |
27 | 27 | ||