# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1271835393 -3600
# Node ID ac9b34a8ddeb8950108c2a6d5204e55d5744e805
# Parent d272865a62d35b3ebdc249334bf071e043b892fc
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@amd.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
xen-unstable changeset: 21210:b36467432eff
xen-unstable date: Wed Apr 21 08:30:45 2010 +0100
---
xen/arch/x86/boot/Makefile | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -r d272865a62d3 -r ac9b34a8ddeb xen/arch/x86/boot/Makefile
--- a/xen/arch/x86/boot/Makefile Wed Apr 21 08:36:05 2010 +0100
+++ b/xen/arch/x86/boot/Makefile Wed Apr 21 08:36:33 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@lists.xensource.com
http://lists.xensource.com/xen-changelog
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1271835393 -3600
# Node ID ac9b34a8ddeb8950108c2a6d5204e55d5744e805
# Parent d272865a62d35b3ebdc249334bf071e043b892fc
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@amd.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
xen-unstable changeset: 21210:b36467432eff
xen-unstable date: Wed Apr 21 08:30:45 2010 +0100
---
xen/arch/x86/boot/Makefile | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
diff -r d272865a62d3 -r ac9b34a8ddeb xen/arch/x86/boot/Makefile
--- a/xen/arch/x86/boot/Makefile Wed Apr 21 08:36:05 2010 +0100
+++ b/xen/arch/x86/boot/Makefile Wed Apr 21 08:36:33 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@lists.xensource.com
http://lists.xensource.com/xen-changelog