Commit 1e6c4dfd authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig:
  kconfig/streamline-config.pl: Fix parsing Makefile with variables
  kconfig/streamline-config.pl: Simplify backslash line concatination
parents 51be0841 364212fd
...@@ -250,33 +250,61 @@ if ($kconfig) { ...@@ -250,33 +250,61 @@ if ($kconfig) {
read_kconfig($kconfig); read_kconfig($kconfig);
} }
sub convert_vars {
my ($line, %vars) = @_;
my $process = "";
while ($line =~ s/^(.*?)(\$\((.*?)\))//) {
my $start = $1;
my $variable = $2;
my $var = $3;
if (defined($vars{$var})) {
$process .= $start . $vars{$var};
} else {
$process .= $start . $variable;
}
}
$process .= $line;
return $process;
}
# Read all Makefiles to map the configs to the objects # Read all Makefiles to map the configs to the objects
foreach my $makefile (@makefiles) { foreach my $makefile (@makefiles) {
my $cont = 0; my $line = "";
my %make_vars;
open(MIN,$makefile) || die "Can't open $makefile"; open(MIN,$makefile) || die "Can't open $makefile";
while (<MIN>) { while (<MIN>) {
# if this line ends with a backslash, continue
chomp;
if (/^(.*)\\$/) {
$line .= $1;
next;
}
$line .= $_;
$_ = $line;
$line = "";
my $objs; my $objs;
# is this a line after a line with a backslash? $_ = convert_vars($_, %make_vars);
if ($cont && /(\S.*)$/) {
$objs = $1;
}
$cont = 0;
# collect objects after obj-$(CONFIG_FOO_BAR) # collect objects after obj-$(CONFIG_FOO_BAR)
if (/obj-\$\((CONFIG_[^\)]*)\)\s*[+:]?=\s*(.*)/) { if (/obj-\$\((CONFIG_[^\)]*)\)\s*[+:]?=\s*(.*)/) {
$var = $1; $var = $1;
$objs = $2; $objs = $2;
# check if variables are set
} elsif (/^\s*(\S+)\s*[:]?=\s*(.*\S)/) {
$make_vars{$1} = $2;
} }
if (defined($objs)) { if (defined($objs)) {
# test if the line ends with a backslash
if ($objs =~ m,(.*)\\$,) {
$objs = $1;
$cont = 1;
}
foreach my $obj (split /\s+/,$objs) { foreach my $obj (split /\s+/,$objs) {
$obj =~ s/-/_/g; $obj =~ s/-/_/g;
if ($obj =~ /(.*)\.o$/) { if ($obj =~ /(.*)\.o$/) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment