openssl: fix do_configure error when cwd is not in @INC
Fixed when building on Debian-testing: | Can't locate find.pl in @INC (@INC contains: /etc/perl /usr/local/lib/x86_64-linux-gnu/perl/5.22.2 /usr/local/share/perl/5.22.2 /usr/lib/x86_64-linux-gnu/perl5/5.22 /usr/share/perl5 /usr/lib/x86_64-linux-gnu/perl/5.22 /usr/share/perl/5.22 /usr/local/lib/site_perl /usr/lib/x86_64-linux-gnu/perl-base) at perlpath.pl line 7. (From OE-Core rev: c28065671b582c140d5971c73791d2ac8bdebe69) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
1fe48d03f8
commit
ffdc23ab53
|
@ -0,0 +1,34 @@
|
|||
From e427748f3bb5d37e78dc8d70a558c373aa8ababb Mon Sep 17 00:00:00 2001
|
||||
From: Robert Yang <liezhi.yang@windriver.com>
|
||||
Date: Mon, 19 Sep 2016 22:06:28 -0700
|
||||
Subject: [PATCH] util/perlpath.pl: make it work when cwd is not in @INC
|
||||
|
||||
Fixed when building on Debian-testing:
|
||||
| Can't locate find.pl in @INC (@INC contains: /etc/perl /usr/local/lib/x86_64-linux-gnu/perl/5.22.2 /usr/local/share/perl/5.22.2 /usr/lib/x86_64-linux-gnu/perl5/5.22 /usr/share/perl5 /usr/lib/x86_64-linux-gnu/perl/5.22 /usr/share/perl/5.22 /usr/local/lib/site_perl /usr/lib/x86_64-linux-gnu/perl-base) at perlpath.pl line 7.
|
||||
|
||||
The find.pl is added by oe-core, so once openssl/find.pl is removed,
|
||||
then this patch can be dropped.
|
||||
|
||||
Upstream-Status: Inappropriate [OE-Specific]
|
||||
|
||||
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||
---
|
||||
util/perlpath.pl | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/util/perlpath.pl b/util/perlpath.pl
|
||||
index a1f236b..5599892 100755
|
||||
--- a/util/perlpath.pl
|
||||
+++ b/util/perlpath.pl
|
||||
@@ -4,6 +4,8 @@
|
||||
# line in all scripts that rely on perl.
|
||||
#
|
||||
|
||||
+BEGIN { unshift @INC, "."; }
|
||||
+
|
||||
require "find.pl";
|
||||
|
||||
$#ARGV == 0 || print STDERR "usage: perlpath newpath (eg /usr/bin)\n";
|
||||
--
|
||||
2.9.0
|
||||
|
|
@ -41,6 +41,7 @@ SRC_URI += "file://find.pl;subdir=${BP}/util/ \
|
|||
file://parallel.patch \
|
||||
file://CVE-2016-2177.patch \
|
||||
file://CVE-2016-2178.patch \
|
||||
file://openssl-util-perlpath.pl-cwd.patch \
|
||||
"
|
||||
SRC_URI[md5sum] = "9392e65072ce4b614c1392eefc1f23d0"
|
||||
SRC_URI[sha256sum] = "1d4007e53aad94a5b2002fe045ee7bb0b3d98f1a47f8b2bc851dcd1c74332919"
|
||||
|
|
Loading…
Reference in New Issue