Contents of /trunk/automake/patches/automake-1.10-perl-5.16.patch
Parent Directory | Revision Log
Revision 2979 -
(show annotations)
(download)
Wed Aug 23 11:37:03 2017 UTC (7 years, 1 month ago) by niro
File size: 3555 byte(s)
Wed Aug 23 11:37:03 2017 UTC (7 years, 1 month ago) by niro
File size: 3555 byte(s)
-added perl fixes
1 | https://bugs.gentoo.org/424453 |
2 | |
3 | From 6bf58a59a1f3803e57e3f0378aa9344686707b75 Mon Sep 17 00:00:00 2001 |
4 | From: Stefano Lattarini <stefano.lattarini@gmail.com> |
5 | Date: Mon, 28 May 2012 13:32:03 +0200 |
6 | Subject: [PATCH] aclocal: declare function prototypes, do not use '&' in |
7 | function calls |
8 | |
9 | This change will also fix automake bug#11543 (from a report by Matt |
10 | Burgess). |
11 | |
12 | * aclocal.in: Declare prototypes for almost all functions early, before |
13 | any actual function definition (but omit the prototype for the dynamically |
14 | generated '&search' function). Add prototypes to any function definition. |
15 | Remove '&' from function invocations (i.e., simply use "func(ARGS..)" |
16 | instead of "&func(ARGS...)"). |
17 | * THANKS, NEWS: Update. |
18 | |
19 | Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com> |
20 | --- |
21 | NEWS | 4 ++++ |
22 | THANKS | 1 + |
23 | aclocal.in | 42 ++++++++++++++++++++++++++++++++++-------- |
24 | 3 files changed, 39 insertions(+), 8 deletions(-) |
25 | |
26 | diff --git a/aclocal.in b/aclocal.in |
27 | index dfb851b..e8855d5 100644 |
28 | --- a/aclocal.in |
29 | +++ b/aclocal.in |
30 | @@ -152,8 +152,34 @@ my $erase_me; |
31 | |
32 | ################################################################ |
33 | |
34 | +# Prototypes for all subroutines. |
35 | + |
36 | +sub unlink_tmp (;$); |
37 | +sub xmkdir_p ($); |
38 | +sub check_acinclude (); |
39 | +sub reset_maps (); |
40 | +sub install_file ($$); |
41 | +sub list_compare (\@\@); |
42 | +sub scan_m4_dirs ($@); |
43 | +sub scan_m4_files (); |
44 | +sub add_macro ($); |
45 | +sub scan_configure_dep ($); |
46 | +sub add_file ($); |
47 | +sub scan_file ($$$); |
48 | +sub strip_redundant_includes (%); |
49 | +sub trace_used_macros (); |
50 | +sub scan_configure (); |
51 | +sub write_aclocal ($@); |
52 | +sub usage ($); |
53 | +sub version (); |
54 | +sub handle_acdir_option ($$); |
55 | +sub parse_arguments (); |
56 | +sub parse_ACLOCAL_PATH (); |
57 | + |
58 | +################################################################ |
59 | + |
60 | # Erase temporary file ERASE_ME. Handle signals. |
61 | -sub unlink_tmp |
62 | +sub unlink_tmp (;$) |
63 | { |
64 | my ($sig) = @_; |
65 | |
66 | @@ -350,7 +376,7 @@ sub scan_m4_dirs ($@) |
67 | next if $file eq 'aclocal.m4'; |
68 | |
69 | my $fullfile = File::Spec->canonpath ("$m4dir/$file"); |
70 | - &scan_file ($type, $fullfile, 'aclocal'); |
71 | + scan_file ($type, $fullfile, 'aclocal'); |
72 | } |
73 | closedir (DIR); |
74 | } |
75 | @@ -361,12 +387,12 @@ sub scan_m4_files () |
76 | { |
77 | # First, scan configure.ac. It may contain macro definitions, |
78 | # or may include other files that define macros. |
79 | - &scan_file (FT_USER, $configure_ac, 'aclocal'); |
80 | + scan_file (FT_USER, $configure_ac, 'aclocal'); |
81 | |
82 | # Then, scan acinclude.m4 if it exists. |
83 | if (-f 'acinclude.m4') |
84 | { |
85 | - &scan_file (FT_USER, 'acinclude.m4', 'aclocal'); |
86 | + scan_file (FT_USER, 'acinclude.m4', 'aclocal'); |
87 | } |
88 | |
89 | # Finally, scan all files in our search paths. |
90 | @@ -380,7 +406,7 @@ sub scan_m4_files () |
91 | my $search = "sub search {\nmy \$found = 0;\n"; |
92 | foreach my $key (reverse sort keys %map) |
93 | { |
94 | - $search .= ('if (/\b\Q' . $key . '\E(?!\w)/) { & add_macro ("' . $key |
95 | + $search .= ('if (/\b\Q' . $key . '\E(?!\w)/) { add_macro ("' . $key |
96 | . '"); $found = 1; }' . "\n"); |
97 | } |
98 | $search .= "return \$found;\n};\n"; |
99 | @@ -403,7 +429,7 @@ sub add_macro ($) |
100 | |
101 | verb "saw macro $macro"; |
102 | $macro_seen{$macro} = 1; |
103 | - &add_file ($map{$macro}); |
104 | + add_file ($map{$macro}); |
105 | } |
106 | |
107 | # scan_configure_dep ($file) |
108 | @@ -465,7 +491,7 @@ sub scan_configure_dep ($) |
109 | } |
110 | |
111 | add_macro ($_) foreach (@rlist); |
112 | - &scan_configure_dep ($_) foreach @ilist; |
113 | + scan_configure_dep ($_) foreach @ilist; |
114 | } |
115 | |
116 | # add_file ($FILE) |
117 | @@ -931,7 +957,7 @@ EOF |
118 | } |
119 | |
120 | # Print version and exit. |
121 | -sub version() |
122 | +sub version () |
123 | { |
124 | print <<EOF; |
125 | aclocal (GNU $PACKAGE) $VERSION |
126 | -- |
127 | 2.1.3 |
128 |