svn commit: trunk/uClibc

[Peter S. Mazinger]

On Sun, 8 Jan 2006, Jan-Benedict Glaw wrote:

> On Sat, 2006-01-07 23:15:42 -0800, vapier at uclibc.org <vapier at uclibc.org> wrote:
> > Author: vapier
> > Date: 2006-01-07 23:15:40 -0800 (Sat, 07 Jan 2006)
> > New Revision: 13147
> > Changeset:
> > Modified: trunk/uClibc/Makefile.in
> > ===================================================================
> > --- trunk/uClibc/Makefile.in	2006-01-08 06:47:05 UTC (rev 13146)
> > +++ trunk/uClibc/Makefile.in	2006-01-08 07:15:40 UTC (rev 13147)
> > @@ -107,13 +107,13 @@
> >  # Installs header files.
> >  install_headers:
> >  	$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include
> > +	echo -e ".svn\n.cvsignore\nCVS" > tar_exclude ; \
> >  	if [ "$(KERNEL_SOURCE)" = "$(DEVEL_PREFIX)" ] ; then \
> > -		extra_exclude="--exclude include/linux --exclude include/asm'*'" ; \
> > -	else \
> > -		extra_exclude="" ; \
> > +		ls -1d include/linux include/asm* >> tar_exclude ; \
> >  	fi ; \
> > -	$(TAR) -chf - --exclude .svn $$extra_exclude include \
> > +	$(TAR) -chf - --exclude-from tar_exclude include \
> >  		| $(TAR) -xf - -C $(PREFIX)$(DEVEL_PREFIX)
> > +	rm -f tar_exclude
> >  	echo -e '#ifndef _LIBC_INTERNAL_H\n#define _LIBC_INTERNAL_H 1\n#endif\n' > \
> >  		$(PREFIX)$(DEVEL_PREFIX)include/libc-internal.h
> >  	$(RM) $(PREFIX)$(DEVEL_PREFIX)include/dl-osinfo.h
> 
> Good idea, but --exclude-from is a GNU tar only thing, so if we use -X
> instead, that will probably run with every tar. (Also, I'd prefer to
> use printf instead of echo, because -e and -n may not be recognized
> by any specific implementationand thus echo was obsoleted, see
> http://www.opengroup.org/onlinepubs/009695399/utilities/echo.html).
> Also, don't use an initial dash, it confuses at least GNU and Solaris
> tar, as well as a trailing slash at the directory name (though here's
> none, just for the records:-)
> 
> This is my proposed patch:
> 
> --- src-uclibc-fresh/Makefile.in	2006-01-08 20:31:40.000000000 +0100
> +++ src-uclibc-hacked/Makefile.in	2006-01-08 20:32:13.000000000 +0100
> @@ -107,12 +107,12 @@ RUNTIME_PREFIX_LIB_FROM_DEVEL_PREFIX_LIB
>  # Installs header files.
>  install_headers:
>  	$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include
> -	echo -e ".svn\n.cvsignore\nCVS" > tar_exclude ; \
> +	printf '.svn\n.cvsignore\nCVS\n' > tar_exclude ; \
>  	if [ "$(KERNEL_SOURCE)" = "$(DEVEL_PREFIX)" ] ; then \
>  		ls -1d include/linux include/asm* >> tar_exclude ; \
>  	fi ; \
> -	$(TAR) -chf - --exclude-from tar_exclude include \
> -		| $(TAR) -xf - -C $(PREFIX)$(DEVEL_PREFIX)
> +	$(TAR) chfX - tar_exclude include \

shouldn't this be -f - -X tar_exclude (or in reverted order, first -X, 
then -f)?

> +		| $(TAR) xf - -C $(PREFIX)$(DEVEL_PREFIX)
>  	rm -f tar_exclude
>  	echo -e '#ifndef _LIBC_INTERNAL_H\n#define _LIBC_INTERNAL_H 1\n#endif\n' > \
>  		$(PREFIX)$(DEVEL_PREFIX)include/libc-internal.h
> MfG, JBG
> 
> 

-- 
Peter S. Mazinger <ps dot m at gmx dot net>           ID: 0xA5F059F2
Key fingerprint = 92A4 31E1 56BC 3D5A 2D08  BB6E C389 975E A5F0 59F2