From aab91be7b26c9ffd6b83a41c18728d169e85592c Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 7 Jul 2016 14:47:43 +0200 Subject: [PATCH] scripts: feeds: fix version detection for Make >= 4.2.1 Signed-off-by: Jo-Philipp Wich --- scripts/feeds | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/feeds b/scripts/feeds index f8f29cd9dd..908e56c60e 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -22,7 +22,10 @@ my @mkver = split /\s+/, `$mk -v`, 4; my $valid_mk = 1; $mkver[0] =~ /^GNU/ or $valid_mk = 0; $mkver[1] =~ /^Make/ or $valid_mk = 0; -$mkver[2] >= "3.81" or $valid_mk = 0; + +my ($mkv1, $mkv2) = split /\./, $mkver[2]; +($mkv1 >= 4 || ($mkv1 == 3 && $mkv2 >= 81)) or $valid_mk = 0; + $valid_mk or die "Unsupported version of make found: $mk\n"; my @feeds;