Changeset 44972


Ignore:
Timestamp:
2015-03-24T14:13:01+01:00 (3 years ago)
Author:
jow
Message:

automake: portability fixes

The rework of the host tools discovery caused automake to embed
absolute paths to staging_dir/host/bin/perl into the shebang
of the generated automake executables.

Switch to the portable "/usr/bin/env perl" and enable global
warnings through "$W" instead of the "-w" interpreter argument.

Signed-off-by: Jo-Philipp Wich <jow@…>

Location:
trunk/tools/automake
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/tools/automake/Makefile

    r44685 r44972  
    2020        --disable-silent-rules 
    2121 
    22 HOST_CONFIGURE_VARS += am_cv_prog_PERL_ithreads=no 
     22HOST_CONFIGURE_VARS += \ 
     23        PERL="/usr/bin/env perl" \ 
     24        am_cv_prog_PERL_ithreads=no 
    2325 
    2426define Host/Configure 
  • trunk/tools/automake/patches/000-relocatable.patch

    r43895 r44972  
    1212--- a/bin/aclocal.in 
    1313+++ b/bin/aclocal.in 
    14 @@ -27,7 +27,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0"; 
     14@@ -1,10 +1,12 @@ 
     15-#!@PERL@ -w 
     16+#!@PERL@ 
     17 # -*- perl -*- 
     18 # @configure_input@ 
     19  
     20 eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' 
     21     if 0; 
     22  
     23+$^W = 1; 
     24+ 
     25 # aclocal - create aclocal.m4 by scanning configure.ac 
     26  
     27 # Copyright (C) 1996-2014 Free Software Foundation, Inc. 
     28@@ -27,7 +29,7 @@ eval 'case $# in 0) exec @PERL@ -S "$0"; 
    1529  
    1630 BEGIN 
     
    2135   unshift @INC, @Aclocal::perl_libdirs; 
    2236 } 
    23 @@ -69,8 +69,8 @@ $perl_threads = 0; 
     37@@ -69,8 +71,8 @@ $perl_threads = 0; 
    2438 # ACLOCAL_PATH environment variable, and reset with the '--system-acdir' 
    2539 # option. 
     
    3448--- a/bin/automake.in 
    3549+++ b/bin/automake.in 
    36 @@ -31,7 +31,7 @@ use strict; 
     50@@ -1,10 +1,12 @@ 
     51-#!@PERL@ -w 
     52+#!@PERL@ 
     53 # -*- perl -*- 
     54 # @configure_input@ 
     55  
     56 eval 'case $# in 0) exec @PERL@ -S "$0";; *) exec @PERL@ -S "$0" "$@";; esac' 
     57     if 0; 
     58  
     59+$^W = 1; 
     60+ 
     61 # automake - create Makefile.in from Makefile.am 
     62 # Copyright (C) 1994-2014 Free Software Foundation, Inc. 
     63  
     64@@ -31,7 +33,7 @@ use strict; 
    3765  
    3866 BEGIN 
     
    4371   unshift @INC, @Automake::perl_libdirs; 
    4472  
     73--- a/t/wrap/aclocal.in 
     74+++ b/t/wrap/aclocal.in 
     75@@ -1,6 +1,8 @@ 
     76-#!@PERL@ -w 
     77+#!@PERL@ 
     78 # @configure_input@ 
     79  
     80+$^W = 1; 
     81+ 
     82 # Copyright (C) 2012-2014 Free Software Foundation, Inc. 
     83  
     84 # This program is free software; you can redistribute it and/or modify 
     85--- a/t/wrap/automake.in 
     86+++ b/t/wrap/automake.in 
     87@@ -1,6 +1,8 @@ 
     88-#!@PERL@ -w 
     89+#!@PERL@ 
     90 # @configure_input@ 
     91  
     92+$^W = 1; 
     93+ 
     94 # Copyright (C) 2012-2014 Free Software Foundation, Inc. 
     95  
     96 # This program is free software; you can redistribute it and/or modify 
  • trunk/tools/automake/patches/100-aclocal-skip-not-existing-directories.patch

    r43895 r44972  
    11--- a/bin/aclocal.in 
    22+++ b/bin/aclocal.in 
    3 @@ -354,6 +354,12 @@ sub scan_m4_dirs ($$@) 
     3@@ -356,6 +356,12 @@ sub scan_m4_dirs ($$@) 
    44  
    55   foreach my $m4dir (@dirlist) 
Note: See TracChangeset for help on using the changeset viewer.