openssl: fix the reference to native perl in ptests

PATCH Superseded Alexander Kanavin 2 participants 2 messages Apr 10, 2017

lore

Share & tools

lore

Alexander Kanavin

author

2017-04-10 15:59 UTC #0 lore raw

PATCH 1/1 openssl: fix the reference to native perl in ptests

This was causing a couple of ptest failures.

[YOCTO #10840]

Signed-off-by Alexander Kanavin <[email protected]>

---
 meta/recipes-connectivity/openssl/openssl.inc | 4 ++++
 1 file changed, 4 insertions(+)

meta/recipes-connectivity/openssl/openssl.inc +4 -0

index 481a4445605..fcaf2318085 100644
@@ -205,6 +205,10 @@ do_install () {
 
 do_install_ptest () {
 	cp -r -L Makefile.org Makefile test ${D}${PTEST_PATH}
+
+        # Replace the path to native perl with the path to target perl
+        sed -i 's,^PERL=.*,PERL=/usr/bin/perl,' ${D}${PTEST_PATH}/Makefile
+
 	cp Configure config e_os.h ${D}${PTEST_PATH}
 	cp -r -L include ${D}${PTEST_PATH}
 	ln -sf ${libdir}/libcrypto.a ${D}${PTEST_PATH}

Signature · 1 line

2.11.0

Richard Purdie

2017-04-10 17:01 UTC #1 lore raw

Quoted 16 lines · Alexander Kanavin

This was causing a couple of ptest failures.
[YOCTO #10840]
Signed-off-by Alexander Kanavin <[email protected]>
---
meta/recipes-connectivity/openssl/openssl.inc | 4 ++++
 1 file changed, 4 insertions(+)
meta/recipes-connectivity/openssl/openssl.inc +0 -0
index 481a4445605..fcaf2318085 100644
@@ -205,6 +205,10 @@ do_install () {

Quoted 8 lines

do_install_ptest () {
cp -r -L Makefile.org Makefile test ${D}${PTEST_PATH} +
+ # Replace the path to native perl with the path to target perl
+ sed -i 's,^PERL=.*,PERL=/usr/bin/perl,' ${D}${PTEST_PATH}/Makefile
+

I think this would need to be ${bindir}/perl?

Cheers,

Richard