[oe-commits] [openembedded-core] 01/07: openssl: use deterministic perl Text::Template module bundled by openssl source

git at git.openembedded.org git at git.openembedded.org
Fri Oct 12 17:03:37 UTC 2018


This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 5e7a75c226d4df0c066f04eaea014b8888c6bed2
Author: Hongxu Jia <hongxu.jia at windriver.com>
AuthorDate: Fri Oct 12 09:28:48 2018 -0700

    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
    
    Signed-off-by: Hongxu Jia <hongxu.jia at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-connectivity/openssl/openssl_1.1.1.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1.bb
index 5a43a15..0351858 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 () {
 	fi
 	# WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the
 	# environment variables set by bitbake. Adjust the environment variables instead.
+	PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \
 	perl ./Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdir} $target
 }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list