summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/nettle/nettle-3.4.1/dlopen-test.patch5
-rw-r--r--meta/recipes-support/nettle/nettle_3.4.1.bb3
2 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-support/nettle/nettle-3.4.1/dlopen-test.patch b/meta/recipes-support/nettle/nettle-3.4.1/dlopen-test.patch
index c4f0b7ea1c..fea5774206 100644
--- a/meta/recipes-support/nettle/nettle-3.4.1/dlopen-test.patch
+++ b/meta/recipes-support/nettle/nettle-3.4.1/dlopen-test.patch
@@ -1,4 +1,4 @@
1Replace relative path of libnettle.so with absolute path so the test 1Remove the relative path for libnettle.so so the test
2program can find it. 2program can find it.
3Relative paths are not suitable, as the folder strucure for ptest 3Relative paths are not suitable, as the folder strucure for ptest
4is different from the one expected by the nettle testsuite. 4is different from the one expected by the nettle testsuite.
@@ -6,6 +6,7 @@ is different from the one expected by the nettle testsuite.
6Upstream-Status: Inappropriate [embedded specific] 6Upstream-Status: Inappropriate [embedded specific]
7 7
8Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> 8Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
9Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
9 10
10--- a/testsuite/dlopen-test.c 2016-10-01 00:28:38.000000000 -0700 11--- a/testsuite/dlopen-test.c 2016-10-01 00:28:38.000000000 -0700
11+++ b/testsuite/dlopen-test.c 2017-10-13 11:08:57.227572860 -0700 12+++ b/testsuite/dlopen-test.c 2017-10-13 11:08:57.227572860 -0700
@@ -14,7 +15,7 @@ Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
14 { 15 {
15 #if HAVE_LIBDL 16 #if HAVE_LIBDL
16- void *handle = dlopen ("../libnettle.so", RTLD_NOW); 17- void *handle = dlopen ("../libnettle.so", RTLD_NOW);
17+ void *handle = dlopen ("/usr/lib/libnettle.so", RTLD_NOW); 18+ void *handle = dlopen ("libnettle.so", RTLD_NOW);
18 int (*get_version)(void); 19 int (*get_version)(void);
19 if (!handle) 20 if (!handle)
20 { 21 {
diff --git a/meta/recipes-support/nettle/nettle_3.4.1.bb b/meta/recipes-support/nettle/nettle_3.4.1.bb
index 8375fcf2df..cd8024f793 100644
--- a/meta/recipes-support/nettle/nettle_3.4.1.bb
+++ b/meta/recipes-support/nettle/nettle_3.4.1.bb
@@ -49,4 +49,7 @@ do_install_ptest() {
49 install ${B}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/ 49 install ${B}/testsuite/*-test ${D}${PTEST_PATH}/testsuite/
50} 50}
51 51
52RDEPENDS_${PN}-ptest += "${PN}-dev"
53INSANE_SKIP_${PN}-ptest += "dev-deps"
54
52BBCLASSEXTEND = "native nativesdk" 55BBCLASSEXTEND = "native nativesdk"