public inbox for crossgcc@sourceware.org
 help / color / mirror / Atom feed
From: "Jason T. Masker" <jason@masker.net>
To: crossgcc <crossgcc@sourceware.org>
Subject: Re: scripts/crosstool-NG.sh.in: patch regex to work with BSD grep
Date: Thu, 16 Oct 2014 14:52:00 -0000	[thread overview]
Message-ID: <CAEFQu-HkQO+NfRb-V7NmcshP2hBA53ow7sb-mz7gOEHKtO34pQ@mail.gmail.com> (raw)

Updated patch to also fix change another occurrence, found in
kconfig/kconfig.mk.


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"

--
For unsubscribe information see http://sourceware.org/lists.html#faq

             reply	other threads:[~2014-10-16 14:52 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-16 14:52 Jason T. Masker [this message]
2014-10-21 17:01 ` [RESEND] [PATCH] " Andreas Bießmann
2014-10-21 17:20 ` [RESENT] [PATCH v2] " Andreas Bießmann
2014-12-05 11:16   ` Bryan Hundven
  -- strict thread matches above, loose matches on Subject: below --
2014-10-14  7:06 Jason T. Masker
2014-10-14  6:44 Jason T. Masker

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CAEFQu-HkQO+NfRb-V7NmcshP2hBA53ow7sb-mz7gOEHKtO34pQ@mail.gmail.com \
    --to=jason@masker.net \
    --cc=crossgcc@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).