summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-11-11 15:14:07 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-25 07:50:32 +0000
commit2e8efb1045caa9ab901fa78288f19293c99955d2 (patch)
tree43ff0e4fef533614cb08dc6ec613da006b7654fb /meta
parent036d2dc77f0d6849f9c1121b2848952217e861c7 (diff)
downloadpoky-2e8efb1045caa9ab901fa78288f19293c99955d2.tar.gz
openssl: use subdir= instead of moving files in do_configure_prepend()
For clarity and correctness of source archiving, don't move find.pl from WORKDIR to S in do_configure_prepend but tell the fetcher to put it in the right place when unpacking. Also re-order the files in SRC_URI so that patches are grouped together. (From OE-Core rev: a960b6024f1b17994b0f4683a4e70fd2a079bd90) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/openssl/openssl_1.0.2d.bb10
1 files changed, 3 insertions, 7 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2d.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2d.bb
index 659e0bd49e..8e8d05fb41 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.2d.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.2d.bb
@@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
11export DIRS = "crypto ssl apps engines" 11export DIRS = "crypto ssl apps engines"
12export OE_LDFLAGS="${LDFLAGS}" 12export OE_LDFLAGS="${LDFLAGS}"
13 13
14SRC_URI += "file://configure-targets.patch \ 14SRC_URI += "file://find.pl;subdir=${BP}/util/ \
15 file://run-ptest \
16 file://configure-targets.patch \
15 file://shared-libs.patch \ 17 file://shared-libs.patch \
16 file://oe-ldflags.patch \ 18 file://oe-ldflags.patch \
17 file://engines-install-in-libdir-ssl.patch \ 19 file://engines-install-in-libdir-ssl.patch \
@@ -29,11 +31,9 @@ SRC_URI += "file://configure-targets.patch \
29 file://openssl_fix_for_x32.patch \ 31 file://openssl_fix_for_x32.patch \
30 file://fix-cipher-des-ede3-cfb1.patch \ 32 file://fix-cipher-des-ede3-cfb1.patch \
31 file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \ 33 file://openssl-avoid-NULL-pointer-dereference-in-EVP_DigestInit_ex.patch \
32 file://find.pl \
33 file://openssl-fix-des.pod-error.patch \ 34 file://openssl-fix-des.pod-error.patch \
34 file://Makefiles-ptest.patch \ 35 file://Makefiles-ptest.patch \
35 file://ptest-deps.patch \ 36 file://ptest-deps.patch \
36 file://run-ptest \
37 file://crypto_use_bigint_in_x86-64_perl.patch \ 37 file://crypto_use_bigint_in_x86-64_perl.patch \
38 file://openssl-1.0.2a-x32-asm.patch \ 38 file://openssl-1.0.2a-x32-asm.patch \
39 file://ptest_makefile_deps.patch \ 39 file://ptest_makefile_deps.patch \
@@ -53,10 +53,6 @@ FILES_${PN}-engines-dbg = "${libdir}/ssl/engines/.debug"
53PARALLEL_MAKE = "" 53PARALLEL_MAKE = ""
54PARALLEL_MAKEINST = "" 54PARALLEL_MAKEINST = ""
55 55
56do_configure_prepend() {
57 cp ${WORKDIR}/find.pl ${S}/util/find.pl
58}
59
60# The crypto_use_bigint patch means that perl's bignum module needs to be 56# The crypto_use_bigint patch means that perl's bignum module needs to be
61# installed, but some distributions (for example Fedora 23) don't ship it by 57# installed, but some distributions (for example Fedora 23) don't ship it by
62# default. As the resulting error is very misleading check for bignum before 58# default. As the resulting error is very misleading check for bignum before