summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Quaresma <quaresma.jose@gmail.com>2023-07-06 11:04:55 +0000
committerSteve Sakoman <steve@sakoman.com>2023-08-01 06:17:28 -1000
commit8d0c51d6302ca25771dcb57d263374c8d0498c11 (patch)
treec4b9d496a198900899dd4a419ad25494f850a953
parent29ef95012555a1ea113c29d0096fc61386b5e5a5 (diff)
downloadpoky-8d0c51d6302ca25771dcb57d263374c8d0498c11.tar.gz
openssl: add PERLEXTERNAL path to test its existence
When upstream change is better to fail or removing the PERL5LIB if they are not need anymore. (From OE-Core rev: 2dda294698ea6bb797531cb4796af263fbf2f6be) Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 337ac1159644678508990927923ef8af30f34cd7) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/recipes-connectivity/openssl/openssl_3.1.1.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl_3.1.1.bb b/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
index f5f3f32a97..b849f9ca79 100644
--- a/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
+++ b/meta/recipes-connectivity/openssl/openssl_3.1.1.bb
@@ -137,7 +137,9 @@ do_configure () {
137 fi 137 fi
138 # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the 138 # WARNING: do not set compiler/linker flags (-I/-D etc.) in EXTRA_OECONF, as they will fully replace the
139 # environment variables set by bitbake. Adjust the environment variables instead. 139 # environment variables set by bitbake. Adjust the environment variables instead.
140 HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \ 140 PERLEXTERNAL="${S}/external/perl/Text-Template-1.46/lib"
141 test -d "$PERLEXTERNAL" || bberror "PERLEXTERNAL '$PERLEXTERNAL' not found!"
142 HASHBANGPERL="/usr/bin/env perl" PERL=perl PERL5LIB="$PERLEXTERNAL" \
141 perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} ${DEPRECATED_CRYPTO_FLAGS} --prefix=$useprefix --openssldir=${libdir}/ssl-3 --libdir=${libdir} $target 143 perl ${S}/Configure ${EXTRA_OECONF} ${PACKAGECONFIG_CONFARGS} ${DEPRECATED_CRYPTO_FLAGS} --prefix=$useprefix --openssldir=${libdir}/ssl-3 --libdir=${libdir} $target
142 perl ${B}/configdata.pm --dump 144 perl ${B}/configdata.pm --dump
143} 145}