projects
/
openwrt
/
staging
/
jogo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a285f18
)
scripts: feeds: fix version detection for Make >= 4.2.1
author
Jo-Philipp Wich
<jo@mein.io>
Wed, 15 Jun 2016 14:39:26 +0000
(16:39 +0200)
committer
Jo-Philipp Wich
<jo@mein.io>
Wed, 15 Jun 2016 17:10:32 +0000
(19:10 +0200)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
scripts/feeds
patch
|
blob
|
history
diff --git
a/scripts/feeds
b/scripts/feeds
index 2b88eb8193367c18567a0ffd969e6bccff59b478..55a8dd94ea76da13ff794c93142f3502d6f96c62 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;