diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-12-13 12:43:23 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-12-13 12:43:23 +0000 |
| commit | afdfa59588539c2af447ca69cec430969fc7d16b (patch) | |
| tree | 4b5f7444434e5deab8d297bc766f7b814868ddbf | |
| parent | e9df2e7e6038b87c333edac12b971d8bfdf54528 (diff) | |
Do not install libc-XXXX.h files in "make install".
glibc does not have them, so should be safe.
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rwxr-xr-x | extra/scripts/install_headers.sh | 19 |
2 files changed, 15 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index d2b3b2bf0..e80b149b4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -205,8 +205,8 @@ install_headers: headers $(top_builddir)extra/scripts/unifdef $(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 diff --git a/extra/scripts/install_headers.sh b/extra/scripts/install_headers.sh index d38d85327..e5314447f 100755 --- a/extra/scripts/install_headers.sh +++ b/extra/scripts/install_headers.sh @@ -41,13 +41,20 @@ IFS='' 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 ) |