On Sun, Aug 18, 2013 at 03:22:07AM +0100, Ken Moffat wrote: > On Sat, Aug 17, 2013 at 08:39:57PM +0100, Matt Burgess wrote: > > On Tue, 2013-08-13 at 15:00 -0500, Bruce Dubbs wrote: > > > > > 103-automake:FAIL: t/primary-prefix-invalid-couples.tap 280 - ... and > > > with the same diagnostic of 'automake -a' > > > 103-automake:# FAIL: 1 > > > > I've just hit this one again. It looks like there's a patch for it at > > https://lists.nongnu.org/archive/html/bug-automake/2013-07/msg00022.html. > > I'll test that in my next build, if you're happy for it to go into > > LFS-7.4-rc2 and to remove the comment about 1 test intermittently failing? > > > > Ta, > > > > Matt. > > > Doesn't apply for me. Not sure why, and I've got enough problems > already. Fixing it would be nice (or, heretically, we could tell > people not to bother with non-toolchain tests ;-) > Now that I've got that test build booted [still building bison by hand :-( ] I've taken another look - whitespace differences (columns offset by two places). Perhaps happened in pasting from the html page. Fixed up, rediffed. Untested (although a user on the list reported it fixed the problem) but attached in case anyone else wants to take a look.
ĸen -- das eine Mal als Tragödie, das andere Mal als Farce
/* FIXME - add a proper header! */ from https://lists.nongnu.org/archive/html/bug-automake/2013-07/msg00022.html Applied by hand diff -Naur automake-1.14.orig/lib/Automake/Variable.pm automake-1.14/lib/Automake/Variable.pm --- automake-1.14.orig/lib/Automake/Variable.pm 2013-06-20 09:44:16.000000000 +0100 +++ automake-1.14/lib/Automake/Variable.pm 2013-08-18 16:07:13.809183173 +0100 @@ -317,21 +317,21 @@ sub variables (;$) { my ($suffix) = @_; + my @vars = (); if ($suffix) { if (exists $_primary_dict{$suffix}) { - return values %{$_primary_dict{$suffix}}; - } - else - { - return (); + @vars = values %{$_primary_dict{$suffix}}; } } else { - return values %_variable_dict; + @vars = values %_variable_dict; } + # The behaviour of the 'sort' built-in is undefined in scalar + # context, hence we need an ad-hoc handling for such context. + return wantarray ? sort { $a->name cmp $b->name } @vars : scalar @vars; } =item C<Automake::Variable::reset> @@ -1080,7 +1080,7 @@ sub variables_dump () { my $text = "all variables:\n{\n"; - foreach my $var (sort { $a->name cmp $b->name } variables) + foreach my $var (variables()) { $text .= $var->dump; } diff -Naur automake-1.14.orig/t/preproc-errmsg.sh automake-1.14/t/preproc-errmsg.sh --- automake-1.14.orig/t/preproc-errmsg.sh 2013-06-19 10:29:50.000000000 +0100 +++ automake-1.14/t/preproc-errmsg.sh 2013-08-18 16:02:15.154823007 +0100 @@ -58,11 +58,11 @@ sub/local.mk:3: 'sub-two.a' is not a standard library name sub/local.mk:3: did you mean 'libsub-two.a'? Makefile.am:2: 'sub/local.mk' included from here -Makefile.am:1: variable 'x1_SOURCES' is defined but no program or -Makefile.am:1: library has 'x1' as canonical name (possible typo) sub/local.mk:4: variable 'sub_x2_SOURCES' is defined but no program or sub/local.mk:4: library has 'sub_x2' as canonical name (possible typo) Makefile.am:2: 'sub/local.mk' included from here +Makefile.am:1: variable 'x1_SOURCES' is defined but no program or +Makefile.am:1: library has 'x1' as canonical name (possible typo) END # We need to break these substitutions into multiple sed invocations
-- http://linuxfromscratch.org/mailman/listinfo/lfs-dev FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
