On Mon, May 26, 2014 at 04:51:26PM +0100, Michael Tautschnig wrote:
> Package: libmakefile-parser-perl
> Version: 0.215-2
> Severity: seriou
> Usertags: goto-cc
> # Failed test 'TEST 1: basics - process returned the 0 status'
> # at t/makesimple.t line 58.
> # got: '1'
> # expected: '0'
[...]
This was broken by make 4.0: scripts/makesimple parses 'make -pqRrs'
output, which has changed.
The attached patch fixes the biggest problem, but it's only a start.
There's still some work left:
t/makesimple.t (Wstat: 1536 Tests: 84 Failed: 6)
Failed tests: 38-39, 41-42, 45, 71
Non-zero exit status: 6
--
Niko Tyni nt...@debian.org
>From 097521aae7b4e8d719e9535077905236aefa0f96 Mon Sep 17 00:00:00 2001
From: Niko Tyni <nt...@debian.org>
Date: Sun, 7 Sep 2014 15:37:58 +0300
Subject: [PATCH] make 4.0 compatibility
---
lib/Makefile/Parser/GmakeDB.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/Makefile/Parser/GmakeDB.pm b/lib/Makefile/Parser/GmakeDB.pm
index 0e876e0..a221490 100644
--- a/lib/Makefile/Parser/GmakeDB.pm
+++ b/lib/Makefile/Parser/GmakeDB.pm
@@ -154,7 +154,7 @@ sub parse ($$) {
undef $var_origin;
}
}
- elsif ($elem =~ /^#\s+(automatic|makefile|default|environment|command line)/) {
+ elsif ($elem =~ /^#\s+(automatic|makefile|default|environment|command line|'override' directive)/) {
$var_origin = $1;
$var_origin = 'file' if $var_origin eq 'makefile';
$next_var_lineno = $elem->lineno + 1;
--
2.1.0
