[Xen-changelog] [xen-unstable] build: Export configure variables to hypervisor build

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>
# Date 1330522825 0
# Node ID f25e5785327e45c8e4e3270effa1d5c3ee4df2ae
# Parent  d6c72d5ab780513e06758044a1a45fec3f5892b7
build: Export configure variables to hypervisor build

Since the introduction of autoconf, builds with XSM enabled in .config
have been broken unless FLASK_ENABLE was explicitly set. Since the
setting in .config has apparently been deprecated in favor of an
autoconf --enable-xsm, add config/Xen.mk to export this to Xen. This
also makes --disable-debug and some paths to be pulled from the
configure process in the hypervisor build.

Signed-off-by: Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>
Committed-by: Keir Fraser <keir@xxxxxxx>
---


diff -r d6c72d5ab780 -r f25e5785327e .gitignore
--- a/.gitignore        Wed Feb 29 13:33:51 2012 +0000
+++ b/.gitignore        Wed Feb 29 13:40:25 2012 +0000
@@ -111,6 +111,7 @@
 tools/config.status
 tools/config.cache
 config/Tools.mk
+config/Xen.mk
 tools/blktap2/daemon/blktapctrl
 tools/blktap2/drivers/img2qcow
 tools/blktap2/drivers/lock-util
diff -r d6c72d5ab780 -r f25e5785327e .hgignore
--- a/.hgignore Wed Feb 29 13:33:51 2012 +0000
+++ b/.hgignore Wed Feb 29 13:40:25 2012 +0000
@@ -309,6 +309,7 @@
 ^tools/config\.status$
 ^tools/config\.cache$
 ^config/Tools\.mk$
+^config/Xen\.mk$
 ^xen/\.banner.*$
 ^xen/BLOG$
 ^xen/System.map$
diff -r d6c72d5ab780 -r f25e5785327e config/Tools.mk.in
--- a/config/Tools.mk.in        Wed Feb 29 13:33:51 2012 +0000
+++ b/config/Tools.mk.in        Wed Feb 29 13:40:25 2012 +0000
@@ -24,10 +24,6 @@
 APPEND_INCLUDES     := @APPEND_INCLUDES@
 APPEND_LIB          := @APPEND_LIB@
 
-# Enable XSM security module (by default, Flask).
-XSM_ENABLE          := @xsm@
-FLASK_ENABLE        := @xsm@
-
 # Download GIT repositories via HTTP or GIT's own protocol?
 # GIT's protocol is faster and more robust, when it works at all (firewalls
 # may block it). We make it the default, but if your GIT repository downloads
diff -r d6c72d5ab780 -r f25e5785327e config/Xen.mk.in
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/config/Xen.mk.in  Wed Feb 29 13:40:25 2012 +0000
@@ -0,0 +1,19 @@
+# Prefix and install folder
+PREFIX              := @prefix@
+LIBLEAFDIR_x86_64   := @LIB_PATH@
+
+# A debug build of xen?
+debug               := @debug@
+
+# Tools path
+PYTHON              := @PYTHON@
+
+# Extra folder for libs/includes
+PREPEND_INCLUDES    := @PREPEND_INCLUDES@
+PREPEND_LIB         := @PREPEND_LIB@
+APPEND_INCLUDES     := @APPEND_INCLUDES@
+APPEND_LIB          := @APPEND_LIB@
+
+# Enable XSM security module (by default, Flask).
+XSM_ENABLE          := @xsm@
+FLASK_ENABLE        := @xsm@
diff -r d6c72d5ab780 -r f25e5785327e tools/configure.ac
--- a/tools/configure.ac        Wed Feb 29 13:33:51 2012 +0000
+++ b/tools/configure.ac        Wed Feb 29 13:40:25 2012 +0000
@@ -6,6 +6,7 @@
     [xen-devel@xxxxxxxxxxxxxxxxxxx])
 AC_CONFIG_SRCDIR([libxl/libxl.c])
 AC_CONFIG_FILES([../config/Tools.mk])
+AC_CONFIG_FILES([../config/Xen.mk])
 AC_CONFIG_HEADERS([config.h])
 AC_PREFIX_DEFAULT([/usr])
 AC_CONFIG_AUX_DIR([.])
diff -r d6c72d5ab780 -r f25e5785327e xen/Rules.mk
--- a/xen/Rules.mk      Wed Feb 29 13:33:51 2012 +0000
+++ b/xen/Rules.mk      Wed Feb 29 13:40:25 2012 +0000
@@ -12,6 +12,7 @@
 lto           ?= n
 
 include $(XEN_ROOT)/Config.mk
+include $(XEN_ROOT)/config/Xen.mk
 
 # Hardcoded configuration implications and dependencies.
 # Do this is a neater way if it becomes unwieldy.

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