From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 15 Jun 2016 14:39:26 +0000 (+0200)
Subject: scripts: feeds: fix version detection for Make >= 4.2.1
X-Git-Tag: v17.01.0-rc1~2341
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=df18b3756fef6a28d9194368d3156f0cd85fae19;p=openwrt%2Fstaging%2Fxback.git

scripts: feeds: fix version detection for Make >= 4.2.1

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/scripts/feeds b/scripts/feeds
index 2b88eb8193..55a8dd94ea 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;