automake: Adjust shebang lines to remove interpreter path hardcode

If build host perl (and other tools) is old and we use some kind
of toolchain to provide recent perl/python/etc to the OE build
we still locked to use build host perl due to hardcoded shebang
lines in automake scripts.

Behaviour was observed with Enterprise Linux 6 and devtoolset
toolchain from SCL (Software Collections) used to provide recent
version of perl (not provided with default buildtools-tarball).

Pass /usr/bin/env perl in ac_cv_path_PERL configuration variables
for class-native and class-nativesdk. Use patch to automake to replace
-w option in shebang line with modern way to enable warnings on perl
(i.e. "use warnings").

Also add nativesdk-autoconf to RDEPENDS to bring runtime dependencies
inline with other targets.

Note that ac_cv_path_PERL must be valid perl interpreter path
since configure will check perl version and Flock implementation.
It is not possible currently to use nativeperl from native
sysroot because automake does not DEPENDS on perl-native (and
doing so fails due to circular dependencies). Only possible
solution is to overwrite shebangs with nativeperl somewhere at
do_install() and update RDEPENDS for class-native. Or add perl
symlinks to nativeperl in sysroot.

For now it seems good to use perl found by /usr/bin/env from
automake-native.

Cc: XE-Linux <xe-linux-external@cisco.com>
(From OE-Core rev: 3b7111b30dbd9a4cdd141b594164da18c15ae970)

Signed-off-by: Serhii Popovych <spopovyc@cisco.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Serhii Popovych
2017-03-31 11:46:58 +00:00
committed by Richard Purdie
parent e44946bff1
commit 4aa21211a3
2 changed files with 109 additions and 3 deletions

View File

@@ -0,0 +1,99 @@
From 41e06b7a354774913dcd2e32a35440e407843357 Mon Sep 17 00:00:00 2001
From: Serhii Popovych <spopovyc@cisco.com>
Date: Wed, 10 Feb 2016 17:07:32 +0000
Subject: [PATCH] perl: Replace -w option in shebangs with modern "use
warnings" In some builds we might provide ac_cv_path_PERL as /usr/bin/env
perl to use newer version of the perl from users PATH rather than older from
standard system path.
However using /usr/bin/env perl -w from shebang line isn't
possible because it translates to something like
/usr/bin/env -w perl and env complains about illegal option.
To address this we can remove -w option from perl shebang
line and add "use warnings" statement.
Upstream-Status: Pending
Signed-off-by: Serhii Popovych <spopovyc@cisco.com>
---
bin/aclocal.in | 3 ++-
bin/automake.in | 3 ++-
t/wrap/aclocal.in | 3 ++-
t/wrap/automake.in | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/bin/aclocal.in b/bin/aclocal.in
index 349f24a..50cb8d3 100644
--- a/bin/aclocal.in
+++ b/bin/aclocal.in
@@ -1,4 +1,4 @@
-#!@PERL@ -w
+#!@PERL@
# -*- perl -*-
# @configure_input@
@@ -33,6 +33,7 @@ BEGIN
}
use strict;
+use warnings;
use Automake::Config;
use Automake::General;
diff --git a/bin/automake.in b/bin/automake.in
index eedc8bc..e0a01cf 100644
--- a/bin/automake.in
+++ b/bin/automake.in
@@ -1,4 +1,4 @@
-#!@PERL@ -w
+#!@PERL@
# -*- perl -*-
# @configure_input@
@@ -28,6 +28,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac'
package Automake;
use strict;
+use warnings;
BEGIN
{
diff --git a/t/wrap/aclocal.in b/t/wrap/aclocal.in
index e64b546..9996899 100644
--- a/t/wrap/aclocal.in
+++ b/t/wrap/aclocal.in
@@ -1,4 +1,4 @@
-#!@PERL@ -w
+#!@PERL@
# @configure_input@
# Copyright (C) 2012-2014 Free Software Foundation, Inc.
@@ -19,6 +19,7 @@
BEGIN
{
use strict;
+ use warnings;
@Aclocal::perl_libdirs = ('@abs_top_srcdir@/lib');
unshift @Aclocal::perl_libdirs, '@abs_top_builddir@/lib'
if '@srcdir@' ne '.';
diff --git a/t/wrap/automake.in b/t/wrap/automake.in
index 8b943b1..be61226 100644
--- a/t/wrap/automake.in
+++ b/t/wrap/automake.in
@@ -1,4 +1,4 @@
-#!@PERL@ -w
+#!@PERL@
# @configure_input@
# Copyright (C) 2012-2014 Free Software Foundation, Inc.
@@ -19,6 +19,7 @@
BEGIN
{
use strict;
+ use warnings;
@Automake::perl_libdirs = ('@abs_top_srcdir@/lib');
unshift @Automake::perl_libdirs, '@abs_top_builddir@/lib'
if '@srcdir@' ne '.';
--
2.3.0

View File

@@ -17,16 +17,23 @@ RDEPENDS_${PN} += "\
perl-module-vars "
RDEPENDS_${PN}_class-native = "autoconf-native hostperl-runtime-native"
RDEPENDS_${PN}_class-nativesdk = "nativesdk-autoconf"
SRC_URI += " file://python-libdir.patch \
SRC_URI += "file://python-libdir.patch \
file://buildtest.patch \
file://performance.patch \
file://new_rt_path_for_test-driver.patch"
file://new_rt_path_for_test-driver.patch \
file://automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch \
"
SRC_URI[md5sum] = "716946a105ca228ab545fc37a70df3a3"
SRC_URI[sha256sum] = "7946e945a96e28152ba5a6beb0625ca715c6e32ac55f2e353ef54def0c8ed924"
CACHED_CONFIGUREVARS += "ac_cv_path_PERL=${USRBINPATH}/perl"
PERL = "${USRBINPATH}/perl"
PERL_class-native = "${USRBINPATH}/env perl"
PERL_class-nativesdk = "${USRBINPATH}/env perl"
CACHED_CONFIGUREVARS += "ac_cv_path_PERL='${PERL}'"
do_install_append () {
install -d ${D}${datadir}