From patchwork Thu Oct 16 14:51:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jason Masker X-Patchwork-Id: 400313 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1E6051400AA for ; Fri, 17 Oct 2014 01:52:32 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:from:date:message-id:subject:to :content-type; q=dns; s=default; b=E/0bl+o3cbMzDNAH6dswC8jWNLUBE km+cyN+JiWv2YJVv4IgdpsmGm1Qj2SdRL2IedHDxIz1cd73qiNrVjdSYGCBeCPfA vuJ5e7PLncT6XpVHjBQqJI7eyTYz9BmJ+5X9PGJvIDYBhAAgbzy03w1+rXZtai7X VX6NxFVvG8m8+E= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:from:date:message-id:subject:to :content-type; s=default; bh=QfuciBkIaVHa2bLNqCsdqI+xunQ=; b=ihg +0MQj2C1JX3w2vib/hzkgDEzZnbGBwy1xjlrwtfnIVkIfGVxtzzgXzYNIHjXj0aV ex8pa5qjT+ZV6ZM9jo4fb7QHqOrtnxaJkPZQpmZqvW41YovSTRrHsij4tPYBfP0e yyeXQg+fu6qUB/sABPpFnwCgfVUOkFPP1vfp1oGY= Received: (qmail 464 invoked by alias); 16 Oct 2014 14:52:23 -0000 Mailing-List: contact crossgcc-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: crossgcc-owner@sourceware.org Delivered-To: mailing list crossgcc@sourceware.org Received: (qmail 453 invoked by uid 89); 16 Oct 2014 14:52:23 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.3 required=5.0 tests=AWL, BAYES_50, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-ob0-f179.google.com Received: from mail-ob0-f179.google.com (HELO mail-ob0-f179.google.com) (209.85.214.179) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Thu, 16 Oct 2014 14:52:21 +0000 Received: by mail-ob0-f179.google.com with SMTP id wp4so2996183obc.38 for ; Thu, 16 Oct 2014 07:52:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:from:date:message-id:subject:to :content-type; bh=6gftm+pIRryEllKMUDDeoxyJq/0UguN+ewZY8kg//VQ=; b=il/Mgcm/TQhKzIo314i66cM7LwQ22SeevZWjW1morHmh+AeakhXlWJAClc5/NQptmU +QcYZGo8DsR2A6YDh7w6rghxF+PafgR+7p/cWO3pI1nooE3zmJaaLaIR0FDjFwP83ito 5fuJYaQcURpXfU9yag6lTtyRGx8v7ToKI2QuRyvlK7FY2RUyO98oLMLNmMrP8zVLw1Ls SQKPetsW4XjBzrNv7JQvC8ME4aN7hzda+DqFGeRVb8896bg1JZ+oixG1Pk/V/0+rpfug VZE5RtLKk/7nHd7dpz0iFtuKl7+4djjXK2R/MDSGXWHlSaKWqjglUWrBWpl3p8jqbL1h mGKw== X-Gm-Message-State: ALoCoQkj1tvv72ujnaxI4JVV8rRVXOfQRi5K7AFUWO0uo+B+VBE7900CaLwg9qlUrb2HFUxgAcwi X-Received: by 10.202.1.80 with SMTP id 77mr1339834oib.31.1413471139849; Thu, 16 Oct 2014 07:52:19 -0700 (PDT) MIME-Version: 1.0 Received: by 10.76.62.12 with HTTP; Thu, 16 Oct 2014 07:51:59 -0700 (PDT) From: "Jason T. Masker" Date: Thu, 16 Oct 2014 10:51:59 -0400 Message-ID: Subject: Re: scripts/crosstool-NG.sh.in: patch regex to work with BSD grep To: crossgcc Updated patch to also fix change another occurrence, found in kconfig/kconfig.mk. --- For unsubscribe information see http://sourceware.org/lists.html#faq diff --git a/kconfig/kconfig.mk b/kconfig/kconfig.mk index cb9f91c..06e022c 100644 --- a/kconfig/kconfig.mk +++ b/kconfig/kconfig.mk @@ -38,7 +38,7 @@ defconfig: # Always be silent, the stdout an be >.config extractconfig: @$(awk) 'BEGIN { dump=0; } \ - dump==1 && $$0~/^\[.....\][[:space:]]+(# |)CT_/ { \ + dump==1 && $$0~/^\[.....\][[:space:]]+(# )?CT_/ { \ $$1=""; \ gsub("^[[:space:]]",""); \ print; \ diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in index cd65d5b..53ac552 100644 --- a/scripts/crosstool-NG.sh.in +++ b/scripts/crosstool-NG.sh.in @@ -125,7 +125,7 @@ CT_DoLog INFO "Build started ${CT_STAR_DATE_HUMAN}" # We really need to extract from ,config and not .config.2, as we # do want the kconfig's values, not our mangled config with arrays. CT_DoStep DEBUG "Dumping user-supplied crosstool-NG configuration" -CT_DoExecLog DEBUG ${grep} -E '^(# |)CT_' .config +CT_DoExecLog DEBUG ${grep} -E '^(# )?CT_' .config CT_EndStep CT_DoLog DEBUG "Unsetting and unexporting MAKEFLAGS"