ia64/xen-unstable

changeset 11842:4154ba04725a

[SOLARIS] Use GNU grep on Solaris.

Signed-off-by: John Levon <john.levon@sun.com>
author kfraser@localhost.localdomain
date Tue Oct 17 16:53:39 2006 +0100 (2006-10-17)
parents f4b7b8aefc05
children a5ef8e491da7
files Config.mk buildconfigs/Rules.mk config/Linux.mk config/SunOS.mk
line diff
     1.1 --- a/Config.mk	Tue Oct 17 16:51:09 2006 +0100
     1.2 +++ b/Config.mk	Tue Oct 17 16:53:39 2006 +0100
     1.3 @@ -24,7 +24,7 @@ EXTRA_INCLUDES += $(EXTRA_PREFIX)/includ
     1.4  EXTRA_LIB += $(EXTRA_PREFIX)/$(LIBDIR)
     1.5  endif
     1.6  
     1.7 -test-gcc-flag = $(shell $(1) -v --help 2>&1 | grep -q " $(2) " && echo $(2))
     1.8 +test-gcc-flag = $(shell $(1) -v --help 2>&1 | $(GREP) -q " $(2) " && echo $(2))
     1.9  
    1.10  ifneq ($(debug),y)
    1.11  CFLAGS += -DNDEBUG
     2.1 --- a/buildconfigs/Rules.mk	Tue Oct 17 16:51:09 2006 +0100
     2.2 +++ b/buildconfigs/Rules.mk	Tue Oct 17 16:53:39 2006 +0100
     2.3 @@ -22,7 +22,7 @@ endif
     2.4  
     2.5  # Expand Linux series to Linux version
     2.6  LINUX_SERIES	?= 2.6
     2.7 -LINUX_VER	?= $(shell grep "^LINUX_VER " buildconfigs/mk.linux-2.6-xen | sed -e 's/.*=[ ]*//')
     2.8 +LINUX_VER	?= $(shell $(GREP) "^LINUX_VER " buildconfigs/mk.linux-2.6-xen | sed -e 's/.*=[ ]*//')
     2.9  
    2.10  # Setup Linux search path
    2.11  LINUX_SRC_PATH	?= .:..
    2.12 @@ -125,7 +125,7 @@ config-update-pae:
    2.13  ifeq ($(XEN_TARGET_X86_PAE),y)
    2.14  	sed -e 's!^CONFIG_HIGHMEM4G=y$$!\# CONFIG_HIGHMEM4G is not set!;s!^\# CONFIG_HIGHMEM64G is not set$$!CONFIG_HIGHMEM64G=y!' $(CONFIG_FILE) > $(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE)
    2.15  else
    2.16 -	grep '^CONFIG_HIGHMEM64G=y' $(CONFIG_FILE) >/dev/null && ( sed -e 's!^CONFIG_HIGHMEM64G=y$$!\# CONFIG_HIGHMEM64G is not set!;s!^\# CONFIG_HIGHMEM4G is not set$$!CONFIG_HIGHMEM4G=y!' $(CONFIG_FILE) > $(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE) ) || true
    2.17 +	$(GREP) '^CONFIG_HIGHMEM64G=y' $(CONFIG_FILE) >/dev/null && ( sed -e 's!^CONFIG_HIGHMEM64G=y$$!\# CONFIG_HIGHMEM64G is not set!;s!^\# CONFIG_HIGHMEM4G is not set$$!CONFIG_HIGHMEM4G=y!' $(CONFIG_FILE) > $(CONFIG_FILE)- && mv $(CONFIG_FILE)- $(CONFIG_FILE) ) || true
    2.18  endif
    2.19  
    2.20  # never delete any intermediate files.
     3.1 --- a/config/Linux.mk	Tue Oct 17 16:51:09 2006 +0100
     3.2 +++ b/config/Linux.mk	Tue Oct 17 16:53:39 2006 +0100
     3.3 @@ -11,6 +11,8 @@ STRIP      = $(CROSS_COMPILE)strip
     3.4  OBJCOPY    = $(CROSS_COMPILE)objcopy
     3.5  OBJDUMP    = $(CROSS_COMPILE)objdump
     3.6  
     3.7 +GREP       = grep
     3.8 +
     3.9  INSTALL      = install
    3.10  INSTALL_DIR  = $(INSTALL) -d -m0755
    3.11  INSTALL_DATA = $(INSTALL) -m0644
     4.1 --- a/config/SunOS.mk	Tue Oct 17 16:51:09 2006 +0100
     4.2 +++ b/config/SunOS.mk	Tue Oct 17 16:53:39 2006 +0100
     4.3 @@ -11,6 +11,8 @@ STRIP      = $(CROSS_COMPILE)gstrip
     4.4  OBJCOPY    = $(CROSS_COMPILE)gobjcopy
     4.5  OBJDUMP    = $(CROSS_COMPILE)gobjdump
     4.6  
     4.7 +GREP       = ggrep
     4.8 +
     4.9  INSTALL      = ginstall
    4.10  INSTALL_DIR  = $(INSTALL) -d -m0755
    4.11  INSTALL_DATA = $(INSTALL) -m0644