Skip to contentSkip to conversation

stubdom: Make stubdom buildsystem consistent with tools buildsystem

PATCH Applied Christoph Egger 2 participants 3 messages May 13, 2013 – May 30, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 stubdom: Make stubdom buildsystem consistent with tools buildsystem

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.

P.S.: Do not forget to regenerate configure with this patch.

config/Stubdom.mk.in +1 -1
diff -r 7952b3ae0d52 -r 44f3eebe1373 config/Stubdom.mk.in
@@ -7,7 +7,7 @@
 
 # Path Programs
 CMAKE               := @CMAKE@
-WGET                := @WGET@ -c
+FETCHER             := @FETCHER@
 
 # A debug build of stubdom? //FIXME: Someone make this do something
 debug               := @debug@
stubdom/Makefile +7 -7
diff -r 7952b3ae0d52 -r 44f3eebe1373 stubdom/Makefile
@@ -68,7 +68,7 @@
 ##############
 
 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 @@
 ############
 
 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 @@
 ##############
 
 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 @@
 ######
 
 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 @@
 # 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 @@
 # 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 @@
 # 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 @@
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 @@
######

grub-$(GRUB_VERSION).tar.gz:
- $(WGET) $(GRUB_URL)/$@
+ $(FETCHER) $@ $(GRUB_URL)/$@

grub-upstream: grub-$(GRUB_VERSION).tar.gz
tar xzf $<

stubdom/configure.ac +1 -0
diff -r 7952b3ae0d52 -r 44f3eebe1373 stubdom/configure.ac
@@ -13,6 +13,7 @@
 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([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])

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.

config/Stubdom.mk.in +1 -1
diff -r 7952b3ae0d52 -r 44f3eebe1373 config/Stubdom.mk.in
@@ -7,7 +7,7 @@
 
 # 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
diff -r 7952b3ae0d52 -r 44f3eebe1373 stubdom/Makefile
@@ -68,7 +68,7 @@
 ##############
 
 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 @@
 ############
 
 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 @@
 ##############
 
 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 @@
 ######
 
 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 @@
 # 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 @@
 # 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 @@
 # 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 @@
 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 @@
 ######
 
 grub-$(GRUB_VERSION).tar.gz:
-	$(WGET) $(GRUB_URL)/$@
+	$(FETCHER) $@ $(GRUB_URL)/$@
 
 grub-upstream: grub-$(GRUB_VERSION).tar.gz
 	tar xzf $<
stubdom/configure.ac +2 -2
diff -r 7952b3ae0d52 -r 44f3eebe1373 stubdom/configure.ac
@@ -13,6 +13,7 @@
 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([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])

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xen.org/xen-devel