aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2016-07-07 14:47:43 +0200
committerimShara <block.runet@gmail.com>2016-10-05 22:10:18 +0300
commitaab91be7b26c9ffd6b83a41c18728d169e85592c (patch)
tree5f2b6429c0e1115a96e0ad96c375fa339fe367a1
parentca3f1a614a1ee90fc67188b375888517f0c151df (diff)
downloadupstream-aab91be7b26c9ffd6b83a41c18728d169e85592c.tar.gz
upstream-aab91be7b26c9ffd6b83a41c18728d169e85592c.tar.bz2
upstream-aab91be7b26c9ffd6b83a41c18728d169e85592c.zip
scripts: feeds: fix version detection for Make >= 4.2.1
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-rwxr-xr-xscripts/feeds5
1 files changed, 4 insertions, 1 deletions
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;