diff options
author | ralph <ralph@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-03-02 17:34:34 +0000 |
---|---|---|
committer | ralph <ralph@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-03-02 17:34:34 +0000 |
commit | b04cc1a5e186d8a09e6faa2028c7755f401cc56f (patch) | |
tree | ee3b869f669409a491eff977784d2d20c1cce8af | |
parent | 2c0ee53d13868ac9fed7dcc05523214546f315bc (diff) |
check for correct make version
( thanks to Thomas )
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14727 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-x | scripts/feeds | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/scripts/feeds b/scripts/feeds index 4b53fd117..deafaca12 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -15,6 +15,14 @@ my $mk=`which gmake`; # select the right 'make' program chomp($mk); # trim trailing newline $mk or $mk = "make"; # default to 'make' +# check version of make +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; +$valid_mk or die "Unsupported version of make found: $mk\n"; + my @feeds; my %build_packages; my %installed; @@ -72,7 +80,7 @@ sub update_location($$) return $old_url ? 1 : 0; } - return 0; + return 0; } sub update_index($) @@ -338,7 +346,7 @@ sub refresh_config { system("rm -f tmp/.packageinfo"); # refresh the config - if ($default) { + if ($default) { system("$mk oldconfig CONFDEFAULT=\"$default\" Config.in >/dev/null 2>/dev/null"); } else { system("$mk defconfig Config.in >/dev/null 2>/dev/null"); |