xen-project/xen
1
0 Fork 0
mirror of https://github.com/xen-project/xen.git synced 2026-10-28 02:01:24 +01:00
Code Issues Activity

stubdom: Make stubdom buildsystem consistent with tools buildsystem

Browse Source 
Use FETCHER for stubdom, too. This makes stubdom buildsystem
more consistent with tools buildsystem.
Fixes toplevel configure failure if wget is not found
independent if we are going to build stubdom or not.

Signed-off-by: Christoph Egger <chegger@amazon.de>
Reviewed-by: Matt Wilson <msw@amazon.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
This commit is contained in:
Christoph Egger authored and Ian Campbell committed 2013-05-30 09:07:53 +01:00
1 parent d21b46e9b7
commit 1ecd5e015d
4 files changed
+117 -59
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

config/Stubdom.mk.in
+1 -1
View File
@@ -7,7 +7,7 @@ LIBDIR := $(libdir)
# Path Programs
CMAKE := @CMAKE@
WGET := @WGET@ -c
FETCHER := @FETCHER@
# A debug build of stubdom? //FIXME: Someone make this do something
debug := @debug@
stubdom/Makefile
+9 -9
View File
@@ -68,7 +68,7 @@ $(eval $(genpath-target))
##############
newlib-$(NEWLIB_VERSION).tar.gz:
$(WGET) $(NEWLIB_URL)/$@
$(FETCHER) $@ $(NEWLIB_URL)/$@
newlib-$(NEWLIB_VERSION): newlib-$(NEWLIB_VERSION).tar.gz
tar xzf $<
@@ -94,7 +94,7 @@ $(NEWLIB_STAMPFILE): mk-headers-$(XEN_TARGET_ARCH) newlib-$(NEWLIB_VERSION)
############
zlib-$(ZLIB_VERSION).tar.gz:
$(WGET) $(ZLIB_URL)/$@
$(FETCHER) $@ $(ZLIB_URL)/$@
zlib-$(XEN_TARGET_ARCH): zlib-$(ZLIB_VERSION).tar.gz
tar xzf $<
@@ -114,7 +114,7 @@ $(ZLIB_STAMPFILE): zlib-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE)
##############
pciutils-$(LIBPCI_VERSION).tar.bz2:
$(WGET) $(LIBPCI_URL)/$@
$(FETCHER) $@ $(LIBPCI_URL)/$@
pciutils-$(XEN_TARGET_ARCH): pciutils-$(LIBPCI_VERSION).tar.bz2
tar xjf $<
@@ -142,7 +142,7 @@ $(LIBPCI_STAMPFILE): pciutils-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE) $(ZLIB_STAM
######
lwip-$(LWIP_VERSION).tar.gz:
$(WGET) $(LWIP_URL)/$@
$(FETCHER) $@ $(LWIP_URL)/$@
lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz
tar xzf $<
@@ -154,7 +154,7 @@ lwip-$(XEN_TARGET_ARCH): lwip-$(LWIP_VERSION).tar.gz
# cross-gmp
#############
gmp-$(GMP_VERSION).tar.bz2:
$(WGET) $(GMP_URL)/$@
$(FETCHER) $@ $(GMP_URL)/$@
.PHONY: cross-gmp
ifeq ($(XEN_TARGET_ARCH), x86_32)
@@ -180,7 +180,7 @@ $(GMP_STAMPFILE): gmp-$(XEN_TARGET_ARCH)
# cross-polarssl
#############
polarssl-$(POLARSSL_VERSION)-gpl.tgz:
$(WGET) $(POLARSSL_URL)/$@
$(FETCHER) $@ $(POLARSSL_URL)/$@
polarssl-$(XEN_TARGET_ARCH): polarssl-$(POLARSSL_VERSION)-gpl.tgz
tar xzf $<
@@ -202,7 +202,7 @@ $(POLARSSL_STAMPFILE): polarssl-$(XEN_TARGET_ARCH) $(NEWLIB_STAMPFILE) lwip-$(XE
# cross-tpmemu
#############
tpm_emulator-$(TPMEMU_VERSION).tar.gz:
$(WGET) $(TPMEMU_URL)/$@
$(FETCHER) $@ $(TPMEMU_URL)/$@
tpm_emulator-$(XEN_TARGET_ARCH): tpm_emulator-$(TPMEMU_VERSION).tar.gz
@if [ ! -f "$(CMAKE)" ]; then echo "cmake not installed! Install it and then rerun ./configure!"; false; fi
@@ -232,7 +232,7 @@ CAMLLIB = $(CROSS_PREFIX)/$(GNU_TARGET_ARCH)-xen-elf/lib/ocaml
OCAML_STAMPFILE=$(CAMLLIB)/.dirstamp
ocaml-$(OCAML_VERSION).tar.gz:
$(WGET) $(OCAML_URL)/$@
$(FETCHER) $@ $(OCAML_URL)/$@
ocaml-$(XEN_TARGET_ARCH)/.dirstamp: ocaml-$(OCAML_VERSION).tar.gz ocaml.patch
tar xzf $<
@@ -385,7 +385,7 @@ vtpmmgr: cross-polarssl
######
grub-$(GRUB_VERSION).tar.gz:
$(WGET) $(GRUB_URL)/$@
$(FETCHER) $@ $(GRUB_URL)/$@
grub-upstream: grub-$(GRUB_VERSION).tar.gz
tar xzf $<
stubdom/configure
Vendored
+105 -47
View File
@@ -593,6 +593,8 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
FETCHER
FTP
WGET
CMAKE
extfiles
@@ -657,7 +659,6 @@ enable_extfiles
host_alias
target_alias
CMAKE
WGET
CC
CFLAGS
LDFLAGS
@@ -1299,7 +1300,6 @@ Optional Features:
Some influential environment variables:
CMAKE Path to the cmake program
WGET Path to wget program
CC C compiler command
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
@@ -1854,6 +1854,8 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
@@ -2162,6 +2164,107 @@ extfiles=$ax_cv_extfiles
# Extract the first word of "wget", so it can be a program name with args.
set dummy wget; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_WGET+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $WGET in
[\\/]* | ?:[\\/]*)
ac_cv_path_WGET="$WGET" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_WGET="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_path_WGET" && ac_cv_path_WGET="no"
;;
esac
fi
WGET=$ac_cv_path_WGET
if test -n "$WGET"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
$as_echo "$WGET" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test x"$WGET" != x"no"; then :
FETCHER="$WGET -c -O"
else
# Extract the first word of "ftp", so it can be a program name with args.
set dummy ftp; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_FTP+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $FTP in
[\\/]* | ?:[\\/]*)
ac_cv_path_FTP="$FTP" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_FTP="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_path_FTP" && ac_cv_path_FTP="no"
;;
esac
fi
FTP=$ac_cv_path_FTP
if test -n "$FTP"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $FTP" >&5
$as_echo "$FTP" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test x"$FTP" != x"no"; then :
FETCHER="$FTP -o"
else
as_fn_error $? "cannot find wget or ftp" "$LINENO" 5
fi
fi
# Checks for programs.
ac_ext=c
@@ -3078,51 +3181,6 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
# Extract the first word of "wget", so it can be a program name with args.
set dummy wget; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_WGET+set}" = set; then :
$as_echo_n "(cached) " >&6
else
case $WGET in
[\\/]* | ?:[\\/]*)
ac_cv_path_WGET="$WGET" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_WGET="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_path_WGET" && ac_cv_path_WGET="no"
;;
esac
fi
WGET=$ac_cv_path_WGET
if test -n "$WGET"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $WGET" >&5
$as_echo "$WGET" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
if test x"${WGET}" = x"no"
then
as_fn_error $? "Unable to find wget, please install wget" "$LINENO" 5
fi
# Checks for programs that depend on a feature
stubdom/configure.ac
+2 -2
View File
@@ -13,6 +13,7 @@ m4_include([../m4/stubdom.m4])
m4_include([../m4/features.m4])
m4_include([../m4/path_or_fail.m4])
m4_include([../m4/depends.m4])
m4_include([../m4/fetcher.m4])
# Enable/disable stub domains
AX_STUBDOM_DEFAULT_ENABLE([ioemu-stubdom], [ioemu])
@@ -27,13 +28,12 @@ AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of stubdom])
AX_ARG_DEFAULT_ENABLE([extfiles], [Use xen extfiles repository for libraries])
AC_ARG_VAR([CMAKE], [Path to the cmake program])
AC_ARG_VAR([WGET], [Path to wget program])
AX_CHECK_FETCHER
# Checks for programs.
AC_PROG_CC
AC_PROG_MAKE_SET
AC_PROG_INSTALL
AX_PATH_PROG_OR_FAIL([WGET], [wget])
# Checks for programs that depend on a feature
AX_DEPENDS_PATH_PROG([vtpm], [CMAKE], [cmake])
Reference in new issue
xen-project/xen
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.

The note is not visible to the blocked user.