Re: [Xen-devel] [PATCH 1/5] build: Export configure variables to hypervisor build

[Roger Pau Monnà <roger.pau@xxxxxxxxxxxxx>]

2012/2/29 Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>:
> 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>
> Cc: Roger Pau Monne <roger.pau@xxxxxxxxxxxxx>
> Cc: Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>

When we started the autoconf stuff we decided to make it a tools only
thing, that's why configure.ac resides in tools/, if the hypervisor
starts using it too, we should move tools/configure.ac and it's stuff
to /. Apart from that, I think the patch is ok, provided that the
following is applied after:

8<--------------------------------------------

autoconf: rebuild configure and check for config/Xen.mk

Rebuild configure after Daniel De Graaf patch. Check for
config/Xen.mk when building the hypervisor and delete config/Xen.mk
when doing a distclean.

Signed-off-by: Roger Pau Monne <roger.pau@xxxxxxxxxxxxx>

diff -r 9e45c5b8b8f2 tools/configure
--- a/tools/configure   Wed Feb 22 06:38:22 2012 +0100
+++ b/tools/configure   Wed Feb 22 07:19:50 2012 +0100
@@ -2435,6 +2435,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

 ac_config_files="$ac_config_files ../config/Tools.mk"

+ac_config_files="$ac_config_files ../config/Xen.mk"
+
 ac_config_headers="$ac_config_headers config.h"


@@ -9588,6 +9590,7 @@ for ac_config_target in $ac_config_targe
 do
   case $ac_config_target in
     "../config/Tools.mk") CONFIG_FILES="$CONFIG_FILES ../config/Tools.mk" ;;
+    "../config/Xen.mk") CONFIG_FILES="$CONFIG_FILES ../config/Xen.mk" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;

   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
diff -r 9e45c5b8b8f2 xen/Makefile
--- a/xen/Makefile      Wed Feb 22 06:38:22 2012 +0100
+++ b/xen/Makefile      Wed Feb 22 07:19:50 2012 +0100
@@ -67,7 +67,7 @@ build install debug clean distclean csco

 .PHONY: _distclean
 _distclean: clean
-       rm -f tags TAGS cscope.files cscope.in.out cscope.out cscope.po.out
+       rm -f tags TAGS cscope.files cscope.in.out cscope.out cscope.po.out
../config/Xen.mk

 $(TARGET).gz: $(TARGET)
        gzip -f -9 < $< > $@.new
diff -r 9e45c5b8b8f2 xen/Rules.mk
--- a/xen/Rules.mk      Wed Feb 22 06:38:22 2012 +0100
+++ b/xen/Rules.mk      Wed Feb 22 07:19:50 2012 +0100
@@ -179,4 +179,8 @@ SPECIAL_DATA_SECTIONS := rodata $(foreac
 %.s: %.S Makefile
        $(CPP) $(AFLAGS) $< -o $@

+$(XEN_ROOT)/config/Xen.mk:
+       @echo "You have to run ./configure before building or installing the
hypervisor"
+       @exit 1
+

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