From: David Marchand <david.marchand@6wind.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH] scripts: fix symbol overriding in configuration files
Date: Thu, 27 Nov 2014 12:29:05 +0100 [thread overview]
Message-ID: <1417087745-9004-1-git-send-email-david.marchand@6wind.com> (raw)
When redefining the same symbol in configuration (basically after an inclusion),
we need to undefine the previous symbol to avoid "redefined" errors.
Signed-off-by: David Marchand <david.marchand@6wind.com>
---
scripts/gen-config-h.sh | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/scripts/gen-config-h.sh b/scripts/gen-config-h.sh
index efd7667..2fac08c 100755
--- a/scripts/gen-config-h.sh
+++ b/scripts/gen-config-h.sh
@@ -33,11 +33,11 @@
echo "#ifndef __RTE_CONFIG_H"
echo "#define __RTE_CONFIG_H"
-grep CONFIG_ $1 \
-| grep -v '^[ \t]*#' \
-| sed 's,CONFIG_\(.*\)=y.*$,#define \1 1,' \
-| sed 's,CONFIG_\(.*\)=n.*$,#undef \1,' \
-| sed 's,CONFIG_\(.*\)=\(.*\)$,#define \1 \2,' \
-| sed 's,\# CONFIG_\(.*\) is not set$,#undef \1,'
+grep CONFIG_ $1 |
+grep -v '^[ \t]*#' |
+sed 's,CONFIG_\(.*\)=y.*$,#undef \1\n#define \1 1,' |
+sed 's,CONFIG_\(.*\)=n.*$,#undef \1,' |
+sed 's,CONFIG_\(.*\)=\(.*\)$,#undef \1\n#define \1 \2,' |
+sed 's,\# CONFIG_\(.*\) is not set$,#undef \1,'
echo "#endif /* __RTE_CONFIG_H */"
--
1.7.10.4
next reply other threads:[~2014-11-27 11:29 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-27 11:29 David Marchand [this message]
2014-11-27 18:17 ` Thomas Monjalon
2014-11-28 13:56 ` Bruce Richardson
2014-11-28 14:06 ` David Marchand
2014-11-28 14:37 ` Bruce Richardson
2014-11-28 14:43 ` Bruce Richardson
2014-11-28 14:49 ` David Marchand
2014-11-28 14:59 ` Bruce Richardson
2014-11-28 15:41 ` David Marchand
2014-11-28 15:42 ` [dpdk-dev] [PATCH] scripts: fix newline character in sed expression David Marchand
2014-11-28 15:49 ` Bruce Richardson
2014-11-28 16:05 ` Thomas Monjalon
2014-11-28 14:35 ` [dpdk-dev] [PATCH] scripts: fix merged lines on FreeBSD in config.h Bruce Richardson
2014-11-28 11:35 ` [dpdk-dev] [PATCH] scripts: fix symbol overriding in configuration files Bruce Richardson
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=1417087745-9004-1-git-send-email-david.marchand@6wind.com \
--to=david.marchand@6wind.com \
--cc=dev@dpdk.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 NNTP newsgroup(s).