mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-27 19:37:10 +02:00
check for correct make version
( thanks to Thomas ) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14727 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
2c0ee53d13
commit
b04cc1a5e1
@ -15,6 +15,14 @@ my $mk=`which gmake`; # select the right 'make' program
|
|||||||
chomp($mk); # trim trailing newline
|
chomp($mk); # trim trailing newline
|
||||||
$mk or $mk = "make"; # default to 'make'
|
$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 @feeds;
|
||||||
my %build_packages;
|
my %build_packages;
|
||||||
my %installed;
|
my %installed;
|
||||||
@ -72,7 +80,7 @@ sub update_location($$)
|
|||||||
return $old_url ? 1 : 0;
|
return $old_url ? 1 : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
sub update_index($)
|
sub update_index($)
|
||||||
@ -338,7 +346,7 @@ sub refresh_config {
|
|||||||
system("rm -f tmp/.packageinfo");
|
system("rm -f tmp/.packageinfo");
|
||||||
|
|
||||||
# refresh the config
|
# refresh the config
|
||||||
if ($default) {
|
if ($default) {
|
||||||
system("$mk oldconfig CONFDEFAULT=\"$default\" Config.in >/dev/null 2>/dev/null");
|
system("$mk oldconfig CONFDEFAULT=\"$default\" Config.in >/dev/null 2>/dev/null");
|
||||||
} else {
|
} else {
|
||||||
system("$mk defconfig Config.in >/dev/null 2>/dev/null");
|
system("$mk defconfig Config.in >/dev/null 2>/dev/null");
|
||||||
|
Loading…
Reference in New Issue
Block a user