[oe-commits] [openembedded-core] 06/13: openssl: fix perl shebang in c_rehash

git at git.openembedded.org git at git.openembedded.org
Sat Mar 7 16:07:52 UTC 2020


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 7cbac66434e3b22373605dc6b83e1e537ce8157a
Author: Martin Jansa <martin.jansa at gmail.com>
AuthorDate: Sat Mar 7 14:30:06 2020 +0100

    openssl: fix perl shebang in c_rehash
    
    * passing PERL=perl breaks c_rehash calls from dash (works fine with bash)
    
      dash doesn't like
      #!perl
      shebang
    
      PERL="/usr/bin/env perl"
      unfortunately just passing PERL like this doesn't pass do_configure:
      Creating Makefile
      sh: 1: /usr/bin/env perl: not found
      WARNING: exit code 1 from a shell command.
    
      But passing it as:
      HASHBANGPERL="/usr/bin/env perl" PERL=perl
      seems to work.
    
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/recipes-connectivity/openssl/openssl_1.1.1d.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1d.bb
index a429b0a..4653d8a 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 () {
 	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.
-	PERL=perl PERL5LIB="${S}/external/perl/Text-Template-1.46/lib/" \
+	HASHBANGPERL="/usr/bin/env perl" 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
 }

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


More information about the Openembedded-commits mailing list