From: Jan-Benedict G. <jb...@us...> - 2006-01-05 18:25:12
|
Update of /cvsroot/linux-vax/toolchain/patches In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26580 Added Files: linux-000000-usr_bin_test.patch linux-000001--lintl_for_conf.patch uclibc-000037-POSIXconform-test.patch uclibc-000038-GNUconform-tar.patch Log Message: - Call /usr/bin/test, not using the builtin. - On Slowlaris, use -lintl when using -lintl functionality. - [ x == y ] is wrong, POSIX says it's [ x = y ] . - Don't use a hardcoded tar, it possibly isn't GNU tar... --- NEW FILE: linux-000001--lintl_for_conf.patch --- diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index a96153f..0b86382 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -1,3 +1,9 @@ +ifeq ($(shell uname),SunOS) +HOST_LOADLIBES := -lintl +else +HOST_LOADLIBES := +endif + # =========================================================================== # Kernel configuration targets # These targets are used from top-level makefile --- NEW FILE: linux-000000-usr_bin_test.patch --- diff --git a/Makefile b/Makefile index f937f1f..9caf3af 100644 --- a/Makefile +++ b/Makefile @@ -392,7 +392,7 @@ scripts/basic/%: scripts_basic ; # using a seperate output directory. This allows convinient use # of make in output directory outputmakefile: - $(Q)if test ! $(srctree) -ef $(objtree); then \ + $(Q)if /usr/bin/test ! $(srctree) -ef $(objtree); then \ $(CONFIG_SHELL) $(srctree)/scripts/mkmakefile \ $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL) \ > $(objtree)/Makefile; \ @@ -937,7 +937,7 @@ _modinst_: @rm -f $(MODLIB)/source @mkdir -p $(MODLIB)/kernel @ln -s $(srctree) $(MODLIB)/source - @if [ ! $(objtree) -ef $(MODLIB)/build ]; then \ + @if /usr/bin/test ! $(objtree) -ef $(MODLIB)/build; then \ rm -f $(MODLIB)/build ; \ ln -s $(objtree) $(MODLIB)/build ; \ fi --- NEW FILE: uclibc-000037-POSIXconform-test.patch --- --- uclibc/Makefile.in~ 2006-01-05 18:12:41.979284000 +0100 +++ uclibc/Makefile.in 2006-01-05 18:13:34.049000000 +0100 @@ -107,7 +107,7 @@ # Installs header files. install_headers: $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include - if [ "$(KERNEL_SOURCE)" == "$(DEVEL_PREFIX)" ] ; then \ + if [ "$(KERNEL_SOURCE)" = "$(DEVEL_PREFIX)" ] ; then \ extra_exclude="--exclude include/linux --exclude include/asm'*'" ; \ else \ extra_exclude="" ; \ --- NEW FILE: uclibc-000038-GNUconform-tar.patch --- --- uclibc/Makefile.in~ 2006-01-05 18:22:24.907660000 +0100 +++ uclibc/Makefile.in 2006-01-05 18:23:45.477423000 +0100 @@ -112,8 +112,8 @@ else \ extra_exclude="" ; \ fi ; \ - tar -chf - --exclude .svn $$extra_exclude include \ - | tar -xf - -C $(PREFIX)$(DEVEL_PREFIX) + $(TAR) -chf - --exclude .svn $$extra_exclude include \ + | $(TAR) -xf - -C $(PREFIX)$(DEVEL_PREFIX) 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 --- uclibc/Rules.mak~ 2006-01-05 18:21:20.707833000 +0100 +++ uclibc/Rules.mak 2006-01-05 18:22:08.717671000 +0100 @@ -36,6 +36,7 @@ INSTALL = install LN = ln RM = rm -f +TAR = tar STRIP_FLAGS ?= -x -R .note -R .comment |