diff options
author | Andre McCurdy <armccurdy@gmail.com> | 2018-08-08 11:15:12 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-29 15:23:50 +0100 |
commit | b3c24d84a4c21b1c3691e7807cd324e42a978919 (patch) | |
tree | 2ebe48e6111022713ab609af8e37613e01219ec7 /meta/recipes-connectivity/openssl/openssl-1.0.2o | |
parent | 61ab3beed1fd1ec584b61dc9d7b3c4b9c1c682e8 (diff) | |
download | poky-b3c24d84a4c21b1c3691e7807cd324e42a978919.tar.gz |
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)
(From OE-Core rev: 1b0dcca0f083081295f32f09b408ab6c6c10f66f)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/openssl/openssl-1.0.2o')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.2o/find.pl | 54 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-util-perlpath.pl-cwd.patch | 34 |
2 files changed, 0 insertions, 88 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/find.pl b/meta/recipes-connectivity/openssl/openssl-1.0.2o/find.pl deleted file mode 100644 index 8e1b42c88a..0000000000 --- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/find.pl +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | 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"; | ||
2 | |||
3 | # This library is deprecated and unmaintained. It is included for | ||
4 | # compatibility with Perl 4 scripts which may use it, but it will be | ||
5 | # removed in a future version of Perl. Please use the File::Find module | ||
6 | # instead. | ||
7 | |||
8 | # Usage: | ||
9 | # require "find.pl"; | ||
10 | # | ||
11 | # &find('/foo','/bar'); | ||
12 | # | ||
13 | # sub wanted { ... } | ||
14 | # where wanted does whatever you want. $dir contains the | ||
15 | # current directory name, and $_ the current filename within | ||
16 | # that directory. $name contains "$dir/$_". You are cd'ed | ||
17 | # to $dir when the function is called. The function may | ||
18 | # set $prune to prune the tree. | ||
19 | # | ||
20 | # For example, | ||
21 | # | ||
22 | # find / -name .nfs\* -mtime +7 -exec rm -f {} \; -o -fstype nfs -prune | ||
23 | # | ||
24 | # corresponds to this | ||
25 | # | ||
26 | # sub wanted { | ||
27 | # /^\.nfs.*$/ && | ||
28 | # (($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_)) && | ||
29 | # int(-M _) > 7 && | ||
30 | # unlink($_) | ||
31 | # || | ||
32 | # ($nlink || (($dev,$ino,$mode,$nlink,$uid,$gid) = lstat($_))) && | ||
33 | # $dev < 0 && | ||
34 | # ($prune = 1); | ||
35 | # } | ||
36 | # | ||
37 | # Set the variable $dont_use_nlink if you're using AFS, since AFS cheats. | ||
38 | |||
39 | use File::Find (); | ||
40 | |||
41 | *name = *File::Find::name; | ||
42 | *prune = *File::Find::prune; | ||
43 | *dir = *File::Find::dir; | ||
44 | *topdir = *File::Find::topdir; | ||
45 | *topdev = *File::Find::topdev; | ||
46 | *topino = *File::Find::topino; | ||
47 | *topmode = *File::Find::topmode; | ||
48 | *topnlink = *File::Find::topnlink; | ||
49 | |||
50 | sub find { | ||
51 | &File::Find::find(\&wanted, @_); | ||
52 | } | ||
53 | |||
54 | 1; | ||
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-util-perlpath.pl-cwd.patch b/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-util-perlpath.pl-cwd.patch deleted file mode 100644 index 065b9b122a..0000000000 --- a/meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-util-perlpath.pl-cwd.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From e427748f3bb5d37e78dc8d70a558c373aa8ababb Mon Sep 17 00:00:00 2001 | ||
2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
3 | Date: Mon, 19 Sep 2016 22:06:28 -0700 | ||
4 | Subject: [PATCH] util/perlpath.pl: make it work when cwd is not in @INC | ||
5 | |||
6 | Fixed when building on Debian-testing: | ||
7 | | 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. | ||
8 | |||
9 | The find.pl is added by oe-core, so once openssl/find.pl is removed, | ||
10 | then this patch can be dropped. | ||
11 | |||
12 | Upstream-Status: Inappropriate [OE-Specific] | ||
13 | |||
14 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
15 | --- | ||
16 | util/perlpath.pl | 2 ++ | ||
17 | 1 file changed, 2 insertions(+) | ||
18 | |||
19 | diff --git a/util/perlpath.pl b/util/perlpath.pl | ||
20 | index a1f236b..5599892 100755 | ||
21 | --- a/util/perlpath.pl | ||
22 | +++ b/util/perlpath.pl | ||
23 | @@ -4,6 +4,8 @@ | ||
24 | # line in all scripts that rely on perl. | ||
25 | # | ||
26 | |||
27 | +BEGIN { unshift @INC, "."; } | ||
28 | + | ||
29 | require "find.pl"; | ||
30 | |||
31 | $#ARGV == 0 || print STDERR "usage: perlpath newpath (eg /usr/bin)\n"; | ||
32 | -- | ||
33 | 2.9.0 | ||
34 | |||