ia64/xen-unstable

changeset 19394:2039e8271051

ioemu-stubdom: Use xen-setup-stubdom rather than configure

xen-setup runs the upstream configure script, and ends up
autodetecting various properties of the host and then trying to use
them in stubdom, which works badly.

In commit c609854fe18aab3216f28e1e5291b75970d398d5 in
qemu-xen-unstable we provide a new `xen-setup-stubdom' script, which
hardcodes the relevant answers.

With these two changes, stubdom should compile again.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Wed Mar 18 17:30:13 2009 +0000 (2009-03-18)
parents 6c20b04e5577
children f0d033f0a319
files stubdom/Makefile
line diff
     1.1 --- a/stubdom/Makefile	Wed Mar 18 17:25:54 2009 +0000
     1.2 +++ b/stubdom/Makefile	Wed Mar 18 17:30:13 2009 +0000
     1.3 @@ -7,8 +7,6 @@ export stubdom=y
     1.4  export debug=y
     1.5  include $(XEN_ROOT)/Config.mk
     1.6  
     1.7 -IOEMU_OPTIONS=--disable-sdl --disable-opengl --disable-vnc-tls --disable-brlapi --disable-kqemu --disable-vde
     1.8 -
     1.9  #ZLIB_URL?=http://www.zlib.net
    1.10  ZLIB_URL=$(XEN_EXTFILES_URL)
    1.11  ZLIB_VERSION=1.2.3
    1.12 @@ -237,8 +235,12 @@ ioemu: cross-zlib cross-libpci libxc
    1.13  	[ -f ioemu/config-host.mak ] || \
    1.14  	  ( $(absolutify_xen_root); \
    1.15  	    cd ioemu ; \
    1.16 -          CONFIG_STUBDOM=yes XEN_TARGET_ARCH=$(XEN_TARGET_ARCH) CFLAGS="$(TARGET_CFLAGS)" sh ./xen-setup --cc=$(CC) --disable-gcc-check $(IOEMU_OPTIONS))
    1.17 -	CPPFLAGS= TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" $(MAKE) -C ioemu LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) TOOLS= CONFIG_STUBDOM=yes
    1.18 +	    LWIPDIR=$(CURDIR)/lwip-$(XEN_TARGET_ARCH) \
    1.19 +	    TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \
    1.20 +	    TARGET_CFLAGS="$(TARGET_CFLAGS)" \
    1.21 +	    TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \
    1.22 +	    ./xen-setup-stubdom )
    1.23 +	$(MAKE) -C ioemu
    1.24  
    1.25  ######
    1.26  # caml