diff options
author | Mingli Yu <Mingli.Yu@windriver.com> | 2019-04-24 16:41:01 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-04-30 12:05:23 +0100 |
commit | d208738062e8aa2c940b23dab268f61636ccc670 (patch) | |
tree | fb1a0b98cc862cd91da72e7414af874ac29079d6 /meta/recipes-support/nettle | |
parent | 47bb6affbeaecc1b79fff9f41bf700c80ed8c75e (diff) | |
download | poky-d208738062e8aa2c940b23dab268f61636ccc670.tar.gz |
nettle: fix ptest failure
Rework dlopen-test.patch to fix below
dlopen-test failure:
# cd /usr/lib64/nettle/ptest
# ./run-ptest
dlopen failed: /usr/lib/libnettle.so: cannot open shared object file: No such file or directory
./run-ptest: line 8: 7607 Aborted "./$f"
FAIL: dlopen-test
As the test dlopen-test depends on libnettle.so
which belongs to nettle-dev package, so add it
to rdepends of nettle-ptest.
(From OE-Core rev: 524fcf34128045f9f5726a1f1b8715a12b12ae7c)
Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/nettle')
-rw-r--r-- | meta/recipes-support/nettle/nettle-3.4.1/dlopen-test.patch | 5 | ||||
-rw-r--r-- | meta/recipes-support/nettle/nettle_3.4.1.bb | 3 |
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 @@ | |||
1 | Replace relative path of libnettle.so with absolute path so the test | 1 | Remove the relative path for libnettle.so so the test |
2 | program can find it. | 2 | program can find it. |
3 | Relative paths are not suitable, as the folder strucure for ptest | 3 | Relative paths are not suitable, as the folder strucure for ptest |
4 | is different from the one expected by the nettle testsuite. | 4 | is different from the one expected by the nettle testsuite. |
@@ -6,6 +6,7 @@ is different from the one expected by the nettle testsuite. | |||
6 | Upstream-Status: Inappropriate [embedded specific] | 6 | 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 | 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 | ||
52 | RDEPENDS_${PN}-ptest += "${PN}-dev" | ||
53 | INSANE_SKIP_${PN}-ptest += "dev-deps" | ||
54 | |||
52 | BBCLASSEXTEND = "native nativesdk" | 55 | BBCLASSEXTEND = "native nativesdk" |