mirror of
https://git.yoctoproject.org/poky
synced 2026-09-15 15:49:32 +02:00
openssl_1.0: drop unnecessary call to perlpath.pl from do_configure()
The perlpath.pl script is used to patch the #! lines in all perl
scripts in the utils directory. However, as these scripts are run via
e.g. "perl foo.pl", they don't actually rely on the #! path to be
correct (which can be confirmed by the observation that the path is
currently being set to ${STAGING_BINDIR_NATIVE}/perl, which doesn't
exist).
(From OE-Core rev: ba88fe46d47846042518a5a1017d782ba548202c)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
23a9cdba16
commit
c1e8a02609
@@ -1,54 +0,0 @@
|
|||||||
warn "Legacy library @{[(caller(0))[6]]} will be removed from the Perl core distribution in the next major release. Please install it from the CPAN distribution Perl4::CoreLibs. It is being used at @{[(caller)[1]]}, line @{[(caller)[2]]}.\n";
|
|
||||||
|
|
||||||
# This library is deprecated and unmaintained. It is included for
|
|
||||||
# compatibility with Perl 4 scripts which may use it, but it will be
|
|
||||||
# removed in a future version of Perl. Please use the File::Find module
|
|
||||||
# instead.
|
|
||||||
|
|
||||||
# Usage:
|
|
||||||
# require "find.pl";
|
|
||||||
#
|
|
||||||
# &find('/foo','/bar');
|
|
||||||
#
|
|
||||||
# sub wanted { ... }
|
|
||||||
# where wanted does whatever you want. $dir contains the
|
|
||||||
# current directory name, and $_ the current filename within
|
|
||||||
# that directory. $name contains "$dir/$_". You are cd'ed
|
|
||||||
# to $dir when the function is called. The function may
|
|
||||||
# set $prune to prune the tree.
|
|
||||||
#
|
|
||||||
# For example,
|
|
||||||
#
|
|
||||||
# find / -name .nfs\* -mtime +7 -exec rm -f {} \; -o -fstype nfs -prune
|
|
||||||
#
|
|
||||||
# corresponds to this
|
|
||||||
#
|
|
||||||
# sub wanted {
|
|
||||||
# /^\.nfs.*$/ &&
|
|
||||||
# (($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_)) &&
|
|
||||||
# int(-M _) > 7 &&
|
|
||||||
# unlink($_)
|
|
||||||
# ||
|
|
||||||
# ($nlink || (($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_))) &&
|
|
||||||
# $dev < 0 &&
|
|
||||||
# ($prune = 1);
|
|
||||||
# }
|
|
||||||
#
|
|
||||||
# Set the variable $dont_use_nlink if you're using AFS, since AFS cheats.
|
|
||||||
|
|
||||||
use File::Find ();
|
|
||||||
|
|
||||||
*name = *File::Find::name;
|
|
||||||
*prune = *File::Find::prune;
|
|
||||||
*dir = *File::Find::dir;
|
|
||||||
*topdir = *File::Find::topdir;
|
|
||||||
*topdev = *File::Find::topdev;
|
|
||||||
*topino = *File::Find::topino;
|
|
||||||
*topmode = *File::Find::topmode;
|
|
||||||
*topnlink = *File::Find::topnlink;
|
|
||||||
|
|
||||||
sub find {
|
|
||||||
&File::Find::find(\&wanted, @_);
|
|
||||||
}
|
|
||||||
|
|
||||||
1;
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
@@ -14,7 +14,6 @@ DEPENDS_append_class-target = " openssl-native"
|
|||||||
PROVIDES += "openssl10"
|
PROVIDES += "openssl10"
|
||||||
|
|
||||||
SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
|
SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
|
||||||
file://find.pl;subdir=openssl-${PV}/util/ \
|
|
||||||
file://run-ptest \
|
file://run-ptest \
|
||||||
file://openssl-c_rehash.sh \
|
file://openssl-c_rehash.sh \
|
||||||
file://configure-targets.patch \
|
file://configure-targets.patch \
|
||||||
@@ -39,7 +38,6 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
|
|||||||
file://ptest_makefile_deps.patch \
|
file://ptest_makefile_deps.patch \
|
||||||
file://configure-musl-target.patch \
|
file://configure-musl-target.patch \
|
||||||
file://parallel.patch \
|
file://parallel.patch \
|
||||||
file://openssl-util-perlpath.pl-cwd.patch \
|
|
||||||
file://Use-SHA256-not-MD5-as-default-digest.patch \
|
file://Use-SHA256-not-MD5-as-default-digest.patch \
|
||||||
file://0001-Fix-build-with-clang-using-external-assembler.patch \
|
file://0001-Fix-build-with-clang-using-external-assembler.patch \
|
||||||
file://0001-openssl-force-soft-link-to-avoid-rare-race.patch \
|
file://0001-openssl-force-soft-link-to-avoid-rare-race.patch \
|
||||||
@@ -102,9 +100,6 @@ do_configure () {
|
|||||||
bbfatal "The perl module 'bignum' was not found but this is required to build openssl. Please install this module (often packaged as perl-bignum) and re-run bitbake."
|
bbfatal "The perl module 'bignum' was not found but this is required to build openssl. Please install this module (often packaged as perl-bignum) and re-run bitbake."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd util
|
|
||||||
perl perlpath.pl ${STAGING_BINDIR_NATIVE}
|
|
||||||
cd ..
|
|
||||||
ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/
|
ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/
|
||||||
|
|
||||||
os=${HOST_OS}
|
os=${HOST_OS}
|
||||||
|
|||||||
Reference in New Issue
Block a user