Fixes automake bug#14441.
* lib/Automake/Rule.pm ($_suffix_rules_default): Remove, superseded by ...
(%suffix_rules_builtin): ... this lexical variable.
($suffix_rules): Remove, superseded by ...
(%suffix_rules): ... this lexical variable.
(suffix_rules, suffix_rules_count): Adjust.
(register_suffix_rule): Update '%suffix_rules_builtin' rather than
'%suffix_rules' if the location (as passed by the '$where' argument)
is an "internal" one (doesn't come from user-provided Makefile.am).
(reset): Simplify resetting of '%suffix_rules' to the default ones
accordingly.
* t/list-of-tests.mk (XFAIL_TESTS): Drop test 'suffix-custom-pr14441.sh'.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
# Suffixes found during a run.
use vars '@_suffixes';
# Suffixes found during a run.
use vars '@_suffixes';
-# Same as $suffix_rules (declared below), but records only the
-# default rules supplied by the languages Automake supports.
-use vars '$_suffix_rules_default';
-
=item C<%dependencies>
Holds the dependencies of targets which dependencies are factored.
=item C<%dependencies>
Holds the dependencies of targets which dependencies are factored.
+my %suffix_rules;
+
+# Same as $suffix_rules, but records only the default rules
+# supplied by the languages Automake supports.
+my %suffix_rules_builtin;
=item C<$KNOWN_EXTENSIONS_PATTERN>
=item C<$KNOWN_EXTENSIONS_PATTERN>
{
%_rule_dict = ();
@_suffixes = ();
{
%_rule_dict = ();
@_suffixes = ();
- # The first time we initialize the variables,
- # we save the value of $suffix_rules.
- if (defined $_suffix_rules_default)
- {
- $suffix_rules = $_suffix_rules_default;
- }
- else
- {
- $_suffix_rules_default = $suffix_rules;
- }
+ %suffix_rules = %suffix_rules_builtin;
sub suffix_rule ($$)
{
my ($source_ext, $obj) = @_;
sub suffix_rule ($$)
{
my ($source_ext, $obj) = @_;
- return undef unless (exists $suffix_rules->{$source_ext} and
- exists $suffix_rules->{$source_ext}{$obj});
- return $suffix_rules->{$source_ext}{$obj}[0];
+ return undef unless (exists $suffix_rules{$source_ext} and
+ exists $suffix_rules{$source_ext}{$obj});
+ return $suffix_rules{$source_ext}{$obj}[0];
}
=item C<register_suffix_rule ($where, $src, $dest)>
}
=item C<register_suffix_rule ($where, $src, $dest)>
sub register_suffix_rule ($$$)
{
my ($where, $src, $dest) = @_;
sub register_suffix_rule ($$$)
{
my ($where, $src, $dest) = @_;
+ my $suffix_rules = $where->{'position'} ? \%suffix_rules
+ : \%suffix_rules_builtin;
verb "Sources ending in $src become $dest";
push @_suffixes, $src, $dest;
verb "Sources ending in $src become $dest";
push @_suffixes, $src, $dest;
sub suffix_rules_count ()
{
sub suffix_rules_count ()
{
- return (scalar keys %$suffix_rules) - (scalar keys %$_suffix_rules_default);
+ return (scalar keys %suffix_rules) - (scalar keys %suffix_rules_builtin);
}
=item C<@list = suffixes>
}
=item C<@list = suffixes>
t/lex-subobj-nodep.sh \
t/remake-am-pr10111.sh \
t/remake-m4-pr10111.sh \
t/lex-subobj-nodep.sh \
t/remake-am-pr10111.sh \
t/remake-m4-pr10111.sh \
-t/suffix-custom-pr14441.sh \
$(perl_fake_XFAIL_TESTS)
perl_TESTS = \
$(perl_fake_XFAIL_TESTS)
perl_TESTS = \