From a92557455dfac85754540f39d2983f9a283db21f Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 21 Apr 2010 08:30:45 +0100 Subject: [PATCH] xen: build fix GNU sed vs. BSD sed Fixes the build error below: gmake[5]: Entering directory `xen/arch/x86/boot' gcc -O1 -fno-omit-frame-pointer -fno-optimize-sibling-calls -m32 -march=3Di686 -g -fno-strict-aliasing -std=3Dgnu99 -Wall -Wstrict-prototypes -Wno-unused-value -Wdeclaration-after-statement -fno-stack-protector -Werror -fno-builtin -msoft-float -c reloc.c -o reloc.o ld -melf_i386 -N -Ttext -o reloc.lnk reloc.o ld: invalid hex number `-o' BSD sed does not support the '+' in the basic re while gnu sed does. BSD sed supports '+' in the extended re and uses the -E flag while gnu sed uses -r. The only difference with the original version is that the '+' qualifier is replaced with '\{1\,\}' which should work with both BSD sed and GNU sed. Signed-off-by: Christoph Egger Acked-by: Ian Jackson --- xen/arch/x86/boot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile index 630b19d027..c90b819555 100644 --- a/xen/arch/x86/boot/Makefile +++ b/xen/arch/x86/boot/Makefile @@ -2,7 +2,7 @@ obj-y += head.o head.o: reloc.S -BOOT_TRAMPOLINE := $(shell sed -n 's,^\#define[[:space:]]\+BOOT_TRAMPOLINE[[:space:]]\+,,p' $(BASEDIR)/include/asm-x86/config.h) +BOOT_TRAMPOLINE := $(shell sed -n 's,^\#define[[:space:]]\{1\,\}BOOT_TRAMPOLINE[[:space:]]\{1\,\},,p' $(BASEDIR)/include/asm-x86/config.h) %.S: %.c RELOC=$(BOOT_TRAMPOLINE) XEN_BITSPERLONG=$(patsubst x86_%,%,$(TARGET_SUBARCH)) $(MAKE) -f build32.mk $@ -- 2.30.2