blob: 0e84c4bf8659d650a27e12f583a0753423e3e1a7 [file] [log] [blame]
Andrew Geissler4ed12e12020-06-05 18:00:41 -05001From 857c843d4bcf576467b505eb05a47f3e7d32caaa Mon Sep 17 00:00:00 2001
Brad Bishop6e60e8b2018-02-01 10:27:11 -05002From: Serhii Popovych <spopovyc@cisco.com>
3Date: Wed, 10 Feb 2016 17:07:32 +0000
4Subject: [PATCH] perl: Replace -w option in shebangs with modern "use
5 warnings" In some builds we might provide ac_cv_path_PERL as /usr/bin/env
6 perl to use newer version of the perl from users PATH rather than older from
7 standard system path.
8
9However using /usr/bin/env perl -w from shebang line isn't
10possible because it translates to something like
11/usr/bin/env -w perl and env complains about illegal option.
12
13To address this we can remove -w option from perl shebang
14line and add "use warnings" statement.
15
16Upstream-Status: Pending
17Signed-off-by: Serhii Popovych <spopovyc@cisco.com>
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080018Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Brad Bishop6e60e8b2018-02-01 10:27:11 -050019
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080020---
21 bin/aclocal.in | 3 ++-
22 bin/automake.in | 3 ++-
23 2 files changed, 4 insertions(+), 2 deletions(-)
24
25diff --git a/bin/aclocal.in b/bin/aclocal.in
Andrew Geissler4ed12e12020-06-05 18:00:41 -050026index 9a20325..bd185d4 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080027--- a/bin/aclocal.in
28+++ b/bin/aclocal.in
Brad Bishop6e60e8b2018-02-01 10:27:11 -050029@@ -1,4 +1,4 @@
30-#!@PERL@ -w
31+#!@PERL@
Andrew Geissler4ed12e12020-06-05 18:00:41 -050032 # aclocal - create aclocal.m4 by scanning configure.ac -*- perl -*-
Brad Bishop6e60e8b2018-02-01 10:27:11 -050033 # @configure_input@
Andrew Geissler4ed12e12020-06-05 18:00:41 -050034 # Copyright (C) 1996-2020 Free Software Foundation, Inc.
35@@ -26,6 +26,7 @@ BEGIN
Brad Bishop6e60e8b2018-02-01 10:27:11 -050036 }
37
38 use strict;
39+use warnings;
40
41 use Automake::Config;
42 use Automake::General;
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080043diff --git a/bin/automake.in b/bin/automake.in
Andrew Geissler4ed12e12020-06-05 18:00:41 -050044index 5ed404a..d387b8e 100644
Brad Bishop1a4b7ee2018-12-16 17:11:34 -080045--- a/bin/automake.in
46+++ b/bin/automake.in
Brad Bishop6e60e8b2018-02-01 10:27:11 -050047@@ -1,4 +1,4 @@
48-#!@PERL@ -w
49+#!@PERL@
Andrew Geissler4ed12e12020-06-05 18:00:41 -050050 # automake - create Makefile.in from Makefile.am -*- perl -*-
Brad Bishop6e60e8b2018-02-01 10:27:11 -050051 # @configure_input@
Andrew Geissler4ed12e12020-06-05 18:00:41 -050052 # Copyright (C) 1994-2020 Free Software Foundation, Inc.
53@@ -23,6 +23,7 @@
Brad Bishop6e60e8b2018-02-01 10:27:11 -050054 package Automake;
55
56 use strict;
57+use warnings;
58
59 BEGIN
60 {