diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2018-10-12 09:28:48 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-10-14 09:20:56 +0100 |
commit | 273af8144e05bcba20adad6cad3886bd97f7bbaf (patch) | |
tree | fa8115edaa18f7ad1c13567a1b595a711ed1b5a7 | |
parent | 9e958c9023ab54b0b402f3316ad38d7492eff527 (diff) | |
download | poky-273af8144e05bcba20adad6cad3886bd97f7bbaf.tar.gz |
openssl: use deterministic perl Text::Template module bundled by openssl source
1. The building openssl requires to install perl Text::Template module(>=1.46),
but Text::Template is a non core Perl module, openssl chooses to bundle
Text::Template 1.46 into the source, for convenience.
https://github.com/openssl/openssl/commit/8ff2af548303d311ce3591406111f77862875a60
2. While Text::Template < 1.46, the produced build files are gravely faulty.
https://github.com/openssl/openssl/pull/6682
3. If host has installed Text::Template < 1.46 (such as CentOS-7.5 has Text::
Template 1.45). The mismatched old module was used although the right one in
openssl source.
So set PERL5LIB to use deterministic perl Text::Template module bundled
by openssl source and ignore the one of host
(From OE-Core rev: 5e7a75c226d4df0c066f04eaea014b8888c6bed2)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.1.1.bb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1.bb index 5a43a150f0..0351858687 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1.bb | |||
@@ -105,6 +105,7 @@ do_configure () { | |||
105 | fi | 105 | fi |
106 | # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the | 106 | # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the |
107 | # environment variables set by bitbake. Adjust the environment variables instead. | 107 | # environment variables set by bitbake. Adjust the environment variables instead. |
108 | PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \ | ||
108 | perl ./Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdir} $target | 109 | perl ./Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdir} $target |
109 | } | 110 | } |
110 | 111 | ||