[Xen-changelog] [xen master] fix qemu building with older make

[patchbot@xxxxxxx]

commit 1b7fe9a1a1757d6634f4319e91a466d2bc8e7ab2
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Mon Aug 4 13:42:34 2014 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Aug 4 13:42:34 2014 +0200

    fix qemu building with older make
    
    The $(or ...) builtin (uses introduced by commits ffbf089357 and
    8962a8f951) is supported only from make 3.81 onwards, yet we claim to
    only require make 3.80. Introduce a good enough fallback.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
    Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---
 Config.mk |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Config.mk b/Config.mk
index 5370e23..015b90b 100644
--- a/Config.mk
+++ b/Config.mk
@@ -12,6 +12,7 @@ space   := $(empty) $(empty)
 
 # fallback for older make
 realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo 
"$$PWD/$(notdir $(file))")))
+or       = $(if $(strip $(1)),$(1),$(if $(strip $(2)),$(2),$(if $(strip 
$(3)),$(3),$(if $(strip $(4)),$(4)))))
 
 -include $(XEN_ROOT)/.config
 
@@ -266,11 +267,11 @@ QEMU_TRADITIONAL_REVISION ?= 
d0395cc49b2ec6d1723c01f1daf2394b9264ca29
 # QEMU_UPSTREAM_LOC ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
 
 # Defaults for subtree locations
-QEMU_TRADITIONAL_LOC ?= $(or $(wildcard $(QEMU_TRADITIONAL_INTREE)),\
-                        $(QEMU_TRADITIONAL_URL))
+QEMU_TRADITIONAL_LOC ?= $(call or,$(wildcard $(QEMU_TRADITIONAL_INTREE)),\
+                                  $(QEMU_TRADITIONAL_URL))
 
-QEMU_UPSTREAM_LOC ?= $(or $(wildcard $(QEMU_UPSTREAM_INTREE)),\
-                        $(QEMU_UPSTREAM_URL))
+QEMU_UPSTREAM_LOC ?= $(call or,$(wildcard $(QEMU_UPSTREAM_INTREE)),\
+                               $(QEMU_UPSTREAM_URL))
 
 # Short answer -- do not enable this unless you know what you are
 # doing and are prepared for some pain.
--
generated by git-patchbot for /home/xen/git/xen.git#master

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