[Xen-changelog] [xen-unstable] xen: build fix GNU sed vs. BSD sed

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1271835045 -3600
# Node ID b36467432effd0c7a94c2677df978b509c0497f7
# Parent  30f70835aa861f2d2a692a6a668d70c8d00b7871
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 <Christoph.Egger@xxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 xen/arch/x86/boot/Makefile |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r 30f70835aa86 -r b36467432eff xen/arch/x86/boot/Makefile
--- a/xen/arch/x86/boot/Makefile        Wed Apr 21 08:29:26 2010 +0100
+++ b/xen/arch/x86/boot/Makefile        Wed Apr 21 08:30:45 2010 +0100
@@ -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 $@
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog