diff options
author | Ruslan Bilovol <rbilovol@cisco.com> | 2020-03-05 13:53:33 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-03-06 08:19:18 +0000 |
commit | 6c9c919fd60dd20e75a9f94a6e9494fbe801d1af (patch) | |
tree | 63cbcce4d49deeb3cdc59cfabd83bfcc0b4f82bb /meta/recipes-connectivity | |
parent | 21240081c0d7d6ee31579a2e950c6fea591270b1 (diff) | |
download | poky-6c9c919fd60dd20e75a9f94a6e9494fbe801d1af.tar.gz |
openssl: pass PERL=perl environment variable to configurator
In our build environment we use wrapper script
for perl in non-standard configuration with
extra variables set (provided by custom
buildtools-tarball).
In this case openssl fails to build because
by default it's Configure script detects and uses
perl executable directly (with absolute path)
obviously missing extra settings from wrapper
script.
Pass PERL=perl environment variable to Configure,
so it won't try to use perl executable directly
but will use what is provided from environment.
(From OE-Core rev: 2b087fef6820da8a6d86ca763bd7730dcac30849)
Signed-off-by: Ruslan Bilovol <rbilovol@cisco.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_1.1.1d.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb index c2ba005f47..d4871fe973 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb | |||
@@ -123,7 +123,7 @@ do_configure () { | |||
123 | fi | 123 | fi |
124 | # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the | 124 | # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the |
125 | # environment variables set by bitbake. Adjust the environment variables instead. | 125 | # environment variables set by bitbake. Adjust the environment variables instead. |
126 | PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \ | 126 | PERL=perl PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \ |
127 | perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdir} $target | 127 | perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdir} $target |
128 | perl ${B}/configdata.pm --dump | 128 | perl ${B}/configdata.pm --dump |
129 | } | 129 | } |