diff options
author | Alistair Francis <alistair.francis@xilinx.com> | 2017-04-12 07:54:13 -0700 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-04-12 21:06:47 +0200 |
commit | 66a6cc750add7b10665ea27b810969dbffaf447a (patch) | |
tree | 6dcb98d45159b9e6f7bfc1338413e80602f18074 /package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch | |
parent | c07a46b0ceef9e909b5274f08d00064a5d3410a4 (diff) | |
download | buildroot-66a6cc750add7b10665ea27b810969dbffaf447a.tar.gz buildroot-66a6cc750add7b10665ea27b810969dbffaf447a.zip |
package/xen: Update to version 4.8.1
Update Xen to version 4.8.1 and update the patches to allow Xen
hypervisor and Xen tools to build.
The patches applied were re-aranged a little bit. Patches 2, 3 and 4
have been accepted by upstream Xen and won't be required in future
releases.
Patch 1 (previously patch 2) is still required and was moved to patch 1
to better reflect it's status.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch')
-rw-r--r-- | package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch b/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch new file mode 100644 index 0000000000..0d4e581af6 --- /dev/null +++ b/package/xen/0001-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch @@ -0,0 +1,36 @@ +From 2a310549aaeaba05f640ade43488bb893101ce4a Mon Sep 17 00:00:00 2001 +From: "Yann E. MORIN" <yann.morin.1998@free.fr> +Date: Sat, 29 Oct 2016 16:35:26 +0200 +Subject: [PATCH] xen/Rules.mk: fix build with CFLAGS from environment + +When CFLAGS are passed from the environment, the first-level make +invocation will append -D__OBJECT_FILE__ to it, then call a second +make invocation, that will have those new CFLAGS in its environment, +but will also append -D__OBJECT_FILE__ to those. + +Then, the compiler fails because __OBEJECT_FILE__ is defined twice. + +Just undefine it before defining it again, as a *workaround* to this +issue. + +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> +--- + xen/Rules.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xen/Rules.mk b/xen/Rules.mk +index a9fda71..09ccbfa 100644 +--- a/xen/Rules.mk ++++ b/xen/Rules.mk +@@ -49,7 +49,7 @@ ALL_OBJS-$(CONFIG_CRYPTO) += $(BASEDIR)/crypto/built_in.o + CFLAGS += -nostdinc -fno-builtin -fno-common + CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith + CFLAGS += -pipe -g -D__XEN__ -include $(BASEDIR)/include/xen/config.h +-CFLAGS += '-D__OBJECT_FILE__="$@"' ++CFLAGS += -U__OBJECT_FILE__ '-D__OBJECT_FILE__="$@"' + + ifneq ($(clang),y) + # Clang doesn't understand this command line argument, and doesn't appear to +-- +2.7.4 + |