summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/openssl
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-connectivity/openssl')
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2o/find.pl54
-rw-r--r--meta/recipes-connectivity/openssl/openssl-1.0.2o/openssl-util-perlpath.pl-cwd.patch34
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.2o.bb5
3 files changed, 0 insertions, 93 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 @@
1warn "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
39use 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
50sub find {
51 &File::Find::find(\&wanted, @_);
52}
53
541;
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 @@
1From e427748f3bb5d37e78dc8d70a558c373aa8ababb Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Mon, 19 Sep 2016 22:06:28 -0700
4Subject: [PATCH] util/perlpath.pl: make it work when cwd is not in @INC
5
6Fixed 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
9The find.pl is added by oe-core, so once openssl/find.pl is removed,
10then this patch can be dropped.
11
12Upstream-Status: Inappropriate [OE-Specific]
13
14Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
15---
16 util/perlpath.pl | 2 ++
17 1 file changed, 2 insertions(+)
18
19diff --git a/util/perlpath.pl b/util/perlpath.pl
20index 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--
332.9.0
34
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
index 78c8552659..8ba03b603c 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2o.bb
@@ -14,7 +14,6 @@ DEPENDS_append_class-target = " openssl-native"
14PROVIDES += "openssl10" 14PROVIDES += "openssl10"
15 15
16SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ 16SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
17 file://find.pl;subdir=openssl-${PV}/util/ \
18 file://run-ptest \ 17 file://run-ptest \
19 file://openssl-c_rehash.sh \ 18 file://openssl-c_rehash.sh \
20 file://configure-targets.patch \ 19 file://configure-targets.patch \
@@ -39,7 +38,6 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \
39 file://ptest_makefile_deps.patch \ 38 file://ptest_makefile_deps.patch \
40 file://configure-musl-target.patch \ 39 file://configure-musl-target.patch \
41 file://parallel.patch \ 40 file://parallel.patch \
42 file://openssl-util-perlpath.pl-cwd.patch \
43 file://Use-SHA256-not-MD5-as-default-digest.patch \ 41 file://Use-SHA256-not-MD5-as-default-digest.patch \
44 file://0001-Fix-build-with-clang-using-external-assembler.patch \ 42 file://0001-Fix-build-with-clang-using-external-assembler.patch \
45 file://0001-openssl-force-soft-link-to-avoid-rare-race.patch \ 43 file://0001-openssl-force-soft-link-to-avoid-rare-race.patch \
@@ -102,9 +100,6 @@ do_configure () {
102 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." 100 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."
103 fi 101 fi
104 102
105 cd util
106 perl perlpath.pl ${STAGING_BINDIR_NATIVE}
107 cd ..
108 ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/ 103 ln -sf apps/openssl.pod crypto/crypto.pod ssl/ssl.pod doc/
109 104
110 os=${HOST_OS} 105 os=${HOST_OS}