aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2014-01-07 17:17:52 +0100
committerGravatar Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>2014-01-07 17:17:52 +0100
commitc71f8bc18e33da575c2f637a4dfa5e6bf120cd3c (patch)
tree0ffb49d74d80dd05b771712c943c291decb765d3
parentc7c5cfdbe803ff0e77f8cded764361ae0803b710 (diff)
downloaduClibc-c71f8bc18e33da575c2f637a4dfa5e6bf120cd3c.tar.gz
uClibc-c71f8bc18e33da575c2f637a4dfa5e6bf120cd3c.tar.bz2
buildsys: fixup unifdef state in skiphash
attempt to fix unifdef swallowing -f defundefile lines Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
-rw-r--r--Makefile.in2
-rwxr-xr-xextra/scripts/install_headers.sh2
-rw-r--r--extra/scripts/unifdef.c4
3 files changed, 3 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in
index 9d06069f7..91ef72fc7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -67,7 +67,7 @@ MAKEFLAGS += -L
$(top_builddir)include/config/linuxthreads/old.h $(top_builddir)include/config/linuxthreads/new.h:
@true
-$(top_builddir)include/generated/unifdef_config.h: $(top_builddir)include/bits/uClibc_config.h| $(top_builddir)include/generated
+$(top_builddir)include/generated/unifdef_config.h: $(top_builddir)include/bits/uClibc_config.h | $(top_builddir)include/generated
@$(disp_gen)
$(Q)$(SED) -e '1,3d' $^ > $@
diff --git a/extra/scripts/install_headers.sh b/extra/scripts/install_headers.sh
index 5a966066d..d40ae1332 100755
--- a/extra/scripts/install_headers.sh
+++ b/extra/scripts/install_headers.sh
@@ -64,7 +64,7 @@ while read -r filename; do
"${srcdir}/$filename" \
| sed -e '/^rtld_hidden_proto[ ]*([a-zA-Z0-9_]*)$/d' \
| sed -e '/^lib\(c\|m\|resolv\|dl\|intl\|rt\|nsl\|util\|crypt\|pthread\)_hidden_proto[ ]*([a-zA-Z0-9_]*)$/d' \
- >"${dstdir}/$filename"
+ > "${dstdir}/$filename"
done
)
diff --git a/extra/scripts/unifdef.c b/extra/scripts/unifdef.c
index b159df0a6..a65355366 100644
--- a/extra/scripts/unifdef.c
+++ b/extra/scripts/unifdef.c
@@ -1098,7 +1098,7 @@ skiphash(void)
const char *cp;
linenum++;
- if (fgets(tline, MAXLINE, input) == NULL) {
+ if (linestate == LS_START && fgets(tline, MAXLINE, input) == NULL) {
if (ferror(input))
err(2, "can't read %s", filename);
else
@@ -1458,9 +1458,7 @@ static bool
defundef(void)
{
const char *cp, *kw, *sym, *val, *end;
- Comment_state wascomment;
- wascomment = incomment;
cp = skiphash();
if (cp == NULL)
return (false);