]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
openssl: pass PERL=perl environment variable to configurator
authorRuslan Bilovol <rbilovol@cisco.com>
Thu, 5 Mar 2020 11:53:33 +0000 (13:53 +0200)
committerArmin Kuster <akuster808@gmail.com>
Mon, 20 Apr 2020 00:15:54 +0000 (17:15 -0700)
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.

Signed-off-by: Ruslan Bilovol <rbilovol@cisco.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 2b087fef6820da8a6d86ca763bd7730dcac30849)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
meta/recipes-connectivity/openssl/openssl_1.1.1d.bb

index 169824a8bef853a4d8492e0b59a2ea07cd76030c..e34f816a4d0e4002a13ca3e57d4012bf2d61e31f 100644 (file)
@@ -120,7 +120,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=perl PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \
        perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} --prefix=$useprefix --openssldir=${libdir}/ssl-1.1 --libdir=${libdir} $target
        perl ${B}/configdata.pm --dump
 }