[PATCH] stubdom: Make stubdom buildsystem consistent with tools buildsystem

All of lore.kernel.org
 help / color / mirror / Atom feed

From: Christoph Egger <chegger@amazon.de>
To: xen-devel <xen-devel@lists.xen.org>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>,
	Ian Campbell <Ian.Campbell@citrix.com>,
	Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Subject: [PATCH] stubdom: Make stubdom buildsystem consistent with tools buildsystem
Date: Mon, 13 May 2013 10:24:31 +0200	[thread overview]
Message-ID: <5190A33F.205@amazon.de> (raw)

[-- Attachment #1: Type: text/plain, Size: 3725 bytes --]

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>

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

diff -r 7952b3ae0d52 -r 44f3eebe1373 config/Stubdom.mk.in
--- a/config/Stubdom.mk.in	Fri May 10 14:13:48 2013 +0000
+++ b/config/Stubdom.mk.in	Fri May 10 13:19:52 2013 +0000
@@ -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@
diff -r 7952b3ae0d52 -r 44f3eebe1373 stubdom/Makefile
--- a/stubdom/Makefile	Fri May 10 14:13:48 2013 +0000
+++ b/stubdom/Makefile	Fri May 10 13:19:52 2013 +0000
@@ -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 $<
diff -r 7952b3ae0d52 -r 44f3eebe1373 stubdom/configure.ac
--- a/stubdom/configure.ac	Fri May 10 14:13:48 2013 +0000
+++ b/stubdom/configure.ac	Fri May 10 13:19:52 2013 +0000
@@ -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])

[-- Attachment #2: patch_stubdom.diff --]
[-- Type: text/plain, Size: 3685 bytes --]

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>

diff -r 7952b3ae0d52 -r 44f3eebe1373 config/Stubdom.mk.in
--- a/config/Stubdom.mk.in	Fri May 10 14:13:48 2013 +0000
+++ b/config/Stubdom.mk.in	Fri May 10 13:19:52 2013 +0000
@@ -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@
diff -r 7952b3ae0d52 -r 44f3eebe1373 stubdom/Makefile
--- a/stubdom/Makefile	Fri May 10 14:13:48 2013 +0000
+++ b/stubdom/Makefile	Fri May 10 13:19:52 2013 +0000
@@ -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 $<
diff -r 7952b3ae0d52 -r 44f3eebe1373 stubdom/configure.ac
--- a/stubdom/configure.ac	Fri May 10 14:13:48 2013 +0000
+++ b/stubdom/configure.ac	Fri May 10 13:19:52 2013 +0000
@@ -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])

[-- Attachment #3: Type: text/plain, Size: 126 bytes --]

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

next             reply	other threads:[~2013-05-13  8:24 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-13  8:24 Christoph Egger [this message]
2013-05-13 10:10 ` [PATCH] stubdom: Make stubdom buildsystem consistent with tools buildsystem Ian Campbell
2013-05-30  9:00   ` Ian Campbell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=5190A33F.205@amazon.de \
    --to=chegger@amazon.de \
    --cc=Ian.Campbell@citrix.com \
    --cc=samuel.thibault@ens-lyon.org \
    --cc=stefano.stabellini@eu.citrix.com \
    --cc=xen-devel@lists.xen.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.