lkml.org 
[lkml]   [2012]   [Jan]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 1/2] kconfig/streamline-config.pl: Simplify backslash line concatination
    From: Steven Rostedt <srostedt@redhat.com>

    Simplify the way lines ending with backslashes (continuation) in Makefiles
    is parsed. This is needed to implement a necessary fix.

    Tested-by: Thomas Lange <thomas-lange2@gmx.de>
    Cc: stable@vger.kernel.org
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    scripts/kconfig/streamline_config.pl | 25 ++++++++++++-------------
    1 files changed, 12 insertions(+), 13 deletions(-)

    diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
    index ec7afce..42ef5ea 100644
    --- a/scripts/kconfig/streamline_config.pl
    +++ b/scripts/kconfig/streamline_config.pl
    @@ -253,17 +253,22 @@ if ($kconfig) {
    # Read all Makefiles to map the configs to the objects
    foreach my $makefile (@makefiles) {

    - my $cont = 0;
    + my $line = "";

    open(MIN,$makefile) || die "Can't open $makefile";
    while (<MIN>) {
    - my $objs;
    -
    - # is this a line after a line with a backslash?
    - if ($cont && /(\S.*)$/) {
    - $objs = $1;
    + # if this line ends with a backslash, continue
    + chomp;
    + if (/^(.*)\\$/) {
    + $line .= $1;
    + next;
    }
    - $cont = 0;
    +
    + $line .= $_;
    + $_ = $line;
    + $line = "";
    +
    + my $objs;

    # collect objects after obj-$(CONFIG_FOO_BAR)
    if (/obj-\$\((CONFIG_[^\)]*)\)\s*[+:]?=\s*(.*)/) {
    @@ -271,12 +276,6 @@ foreach my $makefile (@makefiles) {
    $objs = $2;
    }
    if (defined($objs)) {
    - # test if the line ends with a backslash
    - if ($objs =~ m,(.*)\\$,) {
    - $objs = $1;
    - $cont = 1;
    - }
    -
    foreach my $obj (split /\s+/,$objs) {
    $obj =~ s/-/_/g;
    if ($obj =~ /(.*)\.o$/) {
    --
    1.7.7.3

    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-01-14 00:27    [W:0.023 / U:0.044 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site