Fwd: [PATCH] xen: build fix GNU sed vs. BSD sed

Fwd: [PATCH] xen: build fix GNU sed vs. BSD sed

[Christoph Egger]

[-- Attachment #1: Type: text/plain, Size: 1153 bytes --]


Hi!

Attached patch 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=i686 -g -fno-strict-aliasing -std=gnu99 -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@amd.com>

Keir: Please apply this patch also to xen-4.0-testing.


-- 
---to satisfy European Law for business letters:
Advanced Micro Devices GmbH
Karl-Hammerschmidt-Str. 34, 85609 Dornach b. Muenchen
Geschaeftsfuehrer: Andrew Bowd, Thomas M. McCoy, Giuliano Meroni
Sitz: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632


[-- Attachment #2: xen_sed.diff --]
[-- Type: text/x-diff, Size: 617 bytes --]

diff -r 56fc712b36f3 xen/arch/x86/boot/Makefile
--- a/xen/arch/x86/boot/Makefile	Thu Apr 15 19:19:50 2010 +0100
+++ b/xen/arch/x86/boot/Makefile	Fri Apr 16 13:48:43 2010 +0200
@@ -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 $@
 

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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

Re: Fwd: [PATCH] xen: build fix GNU sed vs. BSD sed

[Ian Jackson]

Christoph Egger writes ("[Xen-devel] Fwd: [PATCH] xen: build fix GNU sed vs. BSD sed"):
> 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.

Urgh.  Still, I guess it will do.

Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

Ian.