From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Egger Subject: Fwd: [PATCH] xen: build fix GNU sed vs. BSD sed Date: Tue, 20 Apr 2010 14:31:44 +0200 Message-ID: <201004201431.44773.Christoph.Egger@amd.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="Boundary-00=_w6ZzLEmLvOtVW+G" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: "xen-devel@lists.xensource.com" List-Id: xen-devel@lists.xenproject.org --Boundary-00=_w6ZzLEmLvOtVW+G Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline 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 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 --Boundary-00=_w6ZzLEmLvOtVW+G Content-Type: text/x-diff; charset="iso 8859-15"; name="xen_sed.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xen_sed.diff" 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 $@ --Boundary-00=_w6ZzLEmLvOtVW+G Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --Boundary-00=_w6ZzLEmLvOtVW+G--