]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
openssl: fix perl shebang in c_rehash
authorMartin Jansa <martin.jansa@gmail.com>
Sat, 7 Mar 2020 13:30:06 +0000 (14:30 +0100)
committerArmin Kuster <akuster808@gmail.com>
Mon, 20 Apr 2020 00:15:54 +0000 (17:15 -0700)
* 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@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 79350826396a882d115caafd88b0a49c91a4fa6c)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
meta/recipes-connectivity/openssl/openssl_1.1.1d.bb

index 249634dce90e93b8d1006ff390c7396f21aebfdb..aa1649207c74bfdea93c78521ad8123b384540ba 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.
-       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
 }