busybox/uClibc
1
0
Fork 0
mirror of https://git.busybox.net/uClibc synced 2025-05-08 23:02:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

buildsys: fixup unifdef state in skiphash

Browse Source 
attempt to fix unifdef swallowing -f defundefile lines

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
This commit is contained in:
Bernhard Reutner-Fischer 2014-01-07 17:17:52 +01:00
parent c7c5cfdbe8
commit c71f8bc18e
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -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' $^ > $@

2
extra/scripts/install_headers.sh
View File

@ -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
)

4
extra/scripts/unifdef.c
View File

@ -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);