svn commit: trunk/uClibc: extra/scripts
vda at uclibc.org
vda at uclibc.org
Sat Dec 13 12:43:24 UTC 2008
Author: vda
Date: 2008-12-13 04:43:23 -0800 (Sat, 13 Dec 2008)
New Revision: 24405
Log:
Do not install libc-XXXX.h files in "make install".
glibc does not have them, so should be safe.
Modified:
trunk/uClibc/Makefile.in
trunk/uClibc/extra/scripts/install_headers.sh
Changeset:
Modified: trunk/uClibc/Makefile.in
===================================================================
--- trunk/uClibc/Makefile.in 2008-12-13 12:37:04 UTC (rev 24404)
+++ trunk/uClibc/Makefile.in 2008-12-13 12:43:23 UTC (rev 24405)
@@ -205,8 +205,8 @@
$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include
top_builddir=$(top_builddir) \
$(top_srcdir)extra/scripts/install_headers.sh include $(PREFIX)$(DEVEL_PREFIX)include
- printf '#ifndef _LIBC_INTERNAL_H\n#define _LIBC_INTERNAL_H 1\n#endif\n' > \
- $(PREFIX)$(DEVEL_PREFIX)include/libc-internal.h
+ # Disabled. If libc-internal.h is needed, document here why!
+ #printf '#ifndef _LIBC_INTERNAL_H\n#define _LIBC_INTERNAL_H 1\n#endif\n' >$(PREFIX)$(DEVEL_PREFIX)include/libc-internal.h
echo '/* Dont use _syscall#() macros; use the syscall() function */' > \
$(PREFIX)$(DEVEL_PREFIX)include/bits/syscalls.h
$(RM) $(PREFIX)$(DEVEL_PREFIX)include/dl-osinfo.h
Modified: trunk/uClibc/extra/scripts/install_headers.sh
===================================================================
--- trunk/uClibc/extra/scripts/install_headers.sh 2008-12-13 12:37:04 UTC (rev 24404)
+++ trunk/uClibc/extra/scripts/install_headers.sh 2008-12-13 12:43:23 UTC (rev 24405)
@@ -41,13 +41,20 @@
while read -r filename; do
if test -d "$1/$filename"; then
mkdir -p "$2/$filename" 2>/dev/null
- else
- # NB: unifdef exits with 1 if output is not
- # exactly the same as input. That's ok.
- # Do not abort the script if unifdef "fails"!
- "$top_builddir/extra/scripts/unifdef" -UUCLIBC_INTERNAL "$1/$filename" \
- | sed -e '/^\(rtld\|lib\(c\|m\|resolv\|dl\|intl\|rt\|nsl\|util\|crypt\|pthread\)\)_hidden_proto[ ]*([a-zA-Z0-9_]*)$/d' >"$2/$filename"
+ continue
fi
+ if test x"${filename##libc-*.h}" = x""; then
+ # Do not install libc-XXXX.h files
+ continue
+ fi
+ # NB: unifdef exits with 1 if output is not
+ # exactly the same as input. That's ok.
+ # Do not abort the script if unifdef "fails"!
+ # NB2: careful with sed command arguments, they contain tab character
+ "$top_builddir/extra/scripts/unifdef" -UUCLIBC_INTERNAL -U_LIBC "$1/$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' \
+ >"$2/$filename"
done
)
More information about the uClibc-cvs
mailing list