From: David Marchand Date: Thu, 27 Nov 2014 11:29:05 +0000 (+0100) Subject: scripts: fix symbol overriding in configuration X-Git-Tag: spdx-start~10021 X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=0a91453deb71af27db59b8c07a8959dd162d2954;p=dpdk.git scripts: fix symbol overriding in configuration 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 Acked-by: Thomas Monjalon --- diff --git a/scripts/gen-config-h.sh b/scripts/gen-config-h.sh index efd7667a15..2fac08c5d0 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 */"