[PATCH] Make sure to use tools as found by configure

[Christoph Egger <chegger@amazon.de>]

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


Hi,

attached patch makes the build process work as described at
http://wiki.xen.org/wiki/Compiling_Xen_From_Source_on_NetBSD

Without this patch compiling the xen kernel fails with
python: No such file or directory

Note, this patch enforces to run configure before you
can compile the xen kernel.
This is already required to build tools and stubdom anyway.

This makes an other patch work as submitted:
http://lists.xen.org/archives/html/xen-devel/2013-04/msg02098.html

Christoph


commit 7172e6e0020328d14638a0bbb66a52c905cb4b0b
Author: Christoph Egger <chegger@amazon.de>
Date:   Thu Feb 7 14:29:19 2013 +0000

    Make sure to use tools as found by configure.
    Fold inclusion of Tools.mk into toplevel Config.mk.

    Signed-off-by: Christoph Egger <chegger@amazon.de>
    Reviewed-by: Matthew Wilson <msw@amazon.com>

diff --git a/Config.mk b/Config.mk
index b1f12ec..149f55a 100644
--- a/Config.mk
+++ b/Config.mk
@@ -7,6 +7,7 @@ endif
 # fallback for older make
 realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file))
&& echo "$$PWD/$(notdir $(file))")))

+-include $(XEN_ROOT)/config/Tools.mk
 -include $(XEN_ROOT)/.config

 # A debug build of Xen and tools?
@@ -76,7 +77,6 @@ EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
 EXTRA_LIB += $(EXTRA_PREFIX)/lib
 endif

-PYTHON      ?= python
 PYTHON_PREFIX_ARG ?= --prefix="$(PREFIX)"
 # The above requires that PREFIX contains *no spaces*. This variable is
here
 # to permit the user to set PYTHON_PREFIX_ARG to '' to workaround this bug:
diff --git a/tools/Rules.mk b/tools/Rules.mk
index 3f03a31..7694a7f 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -3,7 +3,6 @@
 # `all' is the default target
 all:

--include $(XEN_ROOT)/config/Tools.mk
 include $(XEN_ROOT)/Config.mk

 export _INSTALL := $(INSTALL)



[-- Attachment #2: patch_usetools.diff --]
[-- Type: text/plain, Size: 1258 bytes --]

commit 7172e6e0020328d14638a0bbb66a52c905cb4b0b
Author: Christoph Egger <chegger@amazon.de>
Date:   Thu Feb 7 14:29:19 2013 +0000

    Make sure to use tools as found by configure.
    Fold inclusion of Tools.mk into toplevel Config.mk.
    
    Signed-off-by: Christoph Egger <chegger@amazon.de>

diff --git a/Config.mk b/Config.mk
index b1f12ec..149f55a 100644
--- a/Config.mk
+++ b/Config.mk
@@ -7,6 +7,7 @@ endif
 # fallback for older make
 realpath = $(wildcard $(foreach file,$(1),$(shell cd -P $(dir $(file)) && echo "$$PWD/$(notdir $(file))")))
 
+-include $(XEN_ROOT)/config/Tools.mk
 -include $(XEN_ROOT)/.config
 
 # A debug build of Xen and tools?
@@ -76,7 +77,6 @@ EXTRA_INCLUDES += $(EXTRA_PREFIX)/include
 EXTRA_LIB += $(EXTRA_PREFIX)/lib
 endif
 
-PYTHON      ?= python
 PYTHON_PREFIX_ARG ?= --prefix="$(PREFIX)"
 # The above requires that PREFIX contains *no spaces*. This variable is here
 # to permit the user to set PYTHON_PREFIX_ARG to '' to workaround this bug:
diff --git a/tools/Rules.mk b/tools/Rules.mk
index 3f03a31..7694a7f 100644
--- a/tools/Rules.mk
+++ b/tools/Rules.mk
@@ -3,7 +3,6 @@
 # `all' is the default target
 all:
 
--include $(XEN_ROOT)/config/Tools.mk
 include $(XEN_ROOT)/Config.mk
 
 export _INSTALL := $(INSTALL)

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

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