projects
/
15.05
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ca3f1a6
)
scripts: feeds: fix version detection for Make >= 4.2.1
author
Jo-Philipp Wich
<jo@mein.io>
Thu, 7 Jul 2016 12:47:43 +0000
(14:47 +0200)
committer
imShara
<block.runet@gmail.com>
Wed, 5 Oct 2016 19:10:18 +0000
(22:10 +0300)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
scripts/feeds
patch
|
blob
|
history
diff --git
a/scripts/feeds
b/scripts/feeds
index
f8f29cd
..
908e56c
100755
(executable)
--- 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;