diff options
author | Ralph Hempel <ralph.hempel@lantiq.com> | 2009-03-02 17:34:34 +0000 |
---|---|---|
committer | Ralph Hempel <ralph.hempel@lantiq.com> | 2009-03-02 17:34:34 +0000 |
commit | 89181213dceb491a53d9a848e155f628d81e3c8b (patch) | |
tree | 9b3161783aba121a99a64541137ae79ab8a0e629 /scripts/feeds | |
parent | 91042e02a79a015f3e6c949838ea1f7f0f1f9c69 (diff) | |
download | openwrt-89181213dceb491a53d9a848e155f628d81e3c8b.tar.gz openwrt-89181213dceb491a53d9a848e155f628d81e3c8b.tar.bz2 openwrt-89181213dceb491a53d9a848e155f628d81e3c8b.zip |
check for correct make version ( thanks to Thomas )
SVN-Revision: 14727
Diffstat (limited to 'scripts/feeds')
-rwxr-xr-x | scripts/feeds | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/scripts/feeds b/scripts/feeds index 4b53fd1174..deafaca126 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"); |