From 0f2742aa8fcc279fa6f0ebf533784f17f93d12de Mon Sep 17 00:00:00 2001
From: Jacek Konieczny <jajcus@jajcus.net>
Date: Sat, 5 Oct 2013 19:01:27 +0200
Subject: [PATCH] Block downloads during the build

Downloading external resources during build is unreliable and won't
work on our builders, causing non-obvious errors when multi-threaded
make is running.

Removing the '-j1' hack added in the previous commit.
---
 xen-no_fetcher.patch | 19 +++++++++++++++++++
 xen.spec             | 16 +++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 xen-no_fetcher.patch

diff --git a/xen-no_fetcher.patch b/xen-no_fetcher.patch
new file mode 100644
index 0000000..2d8fa49
--- /dev/null
+++ b/xen-no_fetcher.patch
@@ -0,0 +1,19 @@
+diff -dur xen-4.3.0.orig/m4/fetcher.m4 xen-4.3.0/m4/fetcher.m4
+--- xen-4.3.0.orig/m4/fetcher.m4	2013-07-09 12:46:56.000000000 +0200
++++ xen-4.3.0/m4/fetcher.m4	2013-10-05 18:39:42.948294115 +0200
+@@ -1,14 +1,4 @@
+ AC_DEFUN([AX_CHECK_FETCHER], [
+-AC_PATH_PROG([WGET],[wget], [no])
+-AS_IF([test x"$WGET" != x"no"], [
+-    FETCHER="$WGET -c -O"
+-], [
+-    AC_PATH_PROG([FTP],[ftp], [no])
+-    AS_IF([test x"$FTP" != x"no"], [
+-        FETCHER="$FTP -o"
+-    ], [
+-        AC_MSG_ERROR([cannot find wget or ftp])
+-    ])
+-])
++FETCHER="/bin/false Refusing to download"
+ AC_SUBST(FETCHER)
+ ])
diff --git a/xen.spec b/xen.spec
index e6dc155..7098ad3 100644
--- a/xen.spec
+++ b/xen.spec
@@ -102,11 +102,13 @@ Patch10:	%{name}-qemu.patch
 Patch11:	%{name}-ulong.patch
 Patch12:	%{name}-doc.patch
 Patch13:	%{name}-paths.patch
+Patch14:	%{name}-no_fetcher.patch
 URL:		http://www.xen.org/products/xenhyp.html
 %{?with_opengl:BuildRequires:	OpenGL-devel}
 %{?with_sdl:BuildRequires:	SDL-devel >= 1.2.1}
 %ifarch %{ix86} %{x8664}
 BuildRequires:	acpica
+BuildRequires:	autoconf
 BuildRequires:	bcc
 BuildRequires:	bin86
 %endif
@@ -396,6 +398,7 @@ Nadzorca Xen w postaci, która może być uruchomiona wprost z firmware
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 # stubdom sources
 ln -s %{SOURCE10} %{SOURCE11} %{SOURCE12} %{SOURCE13} %{SOURCE14} stubdom
@@ -405,6 +408,17 @@ ln -s %{SOURCE15} tools/firmware/etherboot/ipxe.tar.gz
 echo GIT=/bin/false >> Config.mk
 
 %build
+# based on the 'autoconf.sh' from the sources
+%{__autoconf}
+cd tools
+%{__autoconf}
+%{__autoheader}
+cd ../stubdom
+%{__autoconf}
+cd ../docs
+%{__autoconf}
+cd ..
+
 # if gold is used then bioses and grub doesn't build
 install -d our-ld
 ln -s /usr/bin/ld.bfd our-ld/ld
@@ -423,7 +437,7 @@ export CXXFLAGS="%{rpmcflags} -I/usr/include/ncurses"
 	ac_cv_lib_iconv_libiconv_open=no \
 	--disable-debug
 
-%{__make} -j1 dist-xen dist-tools dist-docs \
+%{__make} dist-xen dist-tools dist-docs \
 	%{!?with_ocaml:OCAML_TOOLS=n} \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
-- 
2.44.0