fix RISCOS cross compiler target to correctly retrieve infozip

3 files changed, 36 insertions, 24 deletions

diff --git a/README b/README
index 84c872c..237dbb3 100644
--- a/README
+++ b/README
@@ -19,8 +19,14 @@ RISC OS
 It is important that the output prefix (/opt/netsurf by default) is writable 
  or use sudo to do the make
 
-	$ cd arm-unknown-riscos
-	$ make
-	$ cd ../sdk
-	$ GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/arm-unknown-riscos/cross/bin GCCSDK_INSTALL_ENV=/opt/netsurf/arm-unknown-riscos/env make
+	$ make -C arm-unknown-riscos
+	$ GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/arm-unknown-riscos/cross/bin GCCSDK_INSTALL_ENV=/opt/netsurf/arm-unknown-riscos/env make -C sdk
 
+
+Windows
+-------
+
+The mingw cross build toolchain is made by
+
+	$ make -C i686-w64-mingw32
+	$ GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/i686-w64-mingw32/cross/bin GCCSDK_INSTALL_ENV=/opt/netsurf/i686-w64-mingw32/env make -C sdk
diff --git a/arm-unknown-riscos/Makefile b/arm-unknown-riscos/Makefile
index dc7c72d..64516de 100644
--- a/arm-unknown-riscos/Makefile
+++ b/arm-unknown-riscos/Makefile
@@ -4,23 +4,23 @@ UPSTREAM_GCCSDK_TARBALL := gcc4$(UPSTREAM_GCCSDK_VERSION).tar.gz
 UPSTREAM_GCCSDK_URI := svn://svn.riscos.info/gccsdk/tags/$(UPSTREAM_GCCSDK_VERSION)
 
 # OSLib 7.00
-UPSTREAM_OSLIB_VERSION := oslib-700
-UPSTREAM_OSLIB_TARBALL := oslib
-UPSTREAM_OSLIB_URI := https://svn.code.sf.net/p/ro-oslib/code/tags/$(UPSTREAM_OSLIB_VERSION)/!OSLib
+UPSTREAM_OSLIB_VERSION := 700
+UPSTREAM_OSLIB_TARBALL := oslib$(UPSTREAM_OSLIB_VERSION).tar.gz
+UPSTREAM_OSLIB_URI := https://svn.code.sf.net/p/ro-oslib/code/tags/oslib-$(UPSTREAM_OSLIB_VERSION)/!OSLib
 
 # Known tested version of trunk for CCRes
 UPSTREAM_CCRES_VERSION := 96
-UPSTREAM_CCRES_TARBALL := ccres
+UPSTREAM_CCRES_TARBALL := ccres$(UPSTREAM_CCRES_VERSION).tar.gz
 UPSTREAM_CCRES_URI := svn://svn.riscos.info/ccres/trunk@$(UPSTREAM_CCRES_VERSION)
 
 # Makerun
-UPSTREAM_MAKERUN_VERSION := unused
-UPSTREAM_MAKERUN_TARBALL := makerun
+UPSTREAM_MAKERUN_VERSION := abdbd16
+UPSTREAM_MAKERUN_TARBALL := makerun$(UPSTREAM_MAKERUN_VERSION).tar.gz
 UPSTREAM_MAKERUN_URI := git://git.netsurf-browser.org/makerun.git
 
 # Squeeze
-UPSTREAM_SQUEEZE_VERSION := unused
-UPSTREAM_SQUEEZE_TARBALL := squeeze
+UPSTREAM_SQUEEZE_VERSION := f26ccd6
+UPSTREAM_SQUEEZE_TARBALL := squeeze$(UPSTREAM_SQUEEZE_VERSION).tar.gz
 UPSTREAM_SQUEEZE_URI := git://git.netsurf-browser.org/squeeze.git
 
 # Infozip
@@ -76,7 +76,7 @@ $(BUILDSTEPS)/infozip.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_INFOZIP_TA
 ###
 
 $(BUILDSTEPS)/makerun.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TARBALL)
-	cp -r $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TARBALL) $(BUILDDIR)/makerun
+	tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TARBALL)
 	cd $(BUILDDIR)/makerun && GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install
 	touch $@
 
@@ -85,7 +85,7 @@ $(BUILDSTEPS)/makerun.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TA
 ###
 
 $(BUILDSTEPS)/squeeze.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TARBALL)
-	cp -r $(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TARBALL) $(BUILDDIR)/squeeze
+	tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TARBALL)
 	cd $(BUILDDIR)/squeeze && GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install
 	touch $@
 
@@ -94,7 +94,7 @@ $(BUILDSTEPS)/squeeze.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TA
 ###
 
 $(BUILDSTEPS)/ccres.d: $(BUILDSTEPS)/oslib.d $(SOURCESDIR)/$(UPSTREAM_CCRES_TARBALL)
-	cp -r $(SOURCESDIR)/$(UPSTREAM_CCRES_TARBALL) $(BUILDDIR)/ccres
+	tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_CCRES_TARBALL)
 	cd $(BUILDDIR)/ccres && GCCSDK_INSTALL_ENV=$(PREFIX)/env GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make
 	cd $(BUILDDIR)/ccres && GCCSDK_INSTALL_ENV=$(PREFIX)/env GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install
 	touch $@
@@ -104,7 +104,7 @@ $(BUILDSTEPS)/ccres.d: $(BUILDSTEPS)/oslib.d $(SOURCESDIR)/$(UPSTREAM_CCRES_TARB
 ###
 
 $(BUILDSTEPS)/oslib.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL)
-	cp -r $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL) $(BUILDDIR)/oslib
+	tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL)
 	for p in `ls $(RECIPES)/patches/oslib/*.p` ; do patch -d $(BUILDDIR)/oslib -p0 <$$p ; done
 	cd $(BUILDDIR)/oslib && GCCSDK_INSTALL_ENV=$(PREFIX)/env GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install
 	touch $@
@@ -138,19 +138,25 @@ $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL):
 	tar -C $(SOURCESDIR) -caf $@ gcc4
 
 $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL):
-	svn co $(UPSTREAM_OSLIB_URI) $@
+	svn co $(UPSTREAM_OSLIB_URI) $(SOURCESDIR)/oslib
+	tar -C $(SOURCESDIR) -caf $@ oslib
 
 $(SOURCESDIR)/$(UPSTREAM_CCRES_TARBALL):
-	svn co $(UPSTREAM_CCRES_URI) $@
+	svn co $(UPSTREAM_CCRES_URI) $(SOURCESDIR)/ccres
+	tar -C $(SOURCESDIR) -caf $@ ccres
 
 $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TARBALL):
-	git clone $(UPSTREAM_MAKERUN_URI) $@
+	$(RM) -rf $(SOURCESDIR)/makerun
+	git clone $(UPSTREAM_MAKERUN_URI) $(SOURCESDIR)/makerun
+	tar -C $(SOURCESDIR) -caf $@ makerun
 
 $(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TARBALL):
-	git clone $(UPSTREAM_SQUEEZE_URI) $@
+	$(RM) -rf $(SOURCESDIR)/squeeze
+	git clone $(UPSTREAM_SQUEEZE_URI) $(SOURCESDIR)/squeeze
+	tar -C $(SOURCESDIR) -caf $@ squeeze
 
-$(SOURCEDIR)/$(UPSTREAM_INFOZIP_TARBALL):
-        $(FETCHSRC) arm-unknown-riscos $(subst $(SOURCEDIR)/,,$@) $(UPSTREAM_INFOZIP_URI) $@
+$(SOURCESDIR)/$(UPSTREAM_INFOZIP_TARBALL):
+	$(FETCHSRC) arm-unknown-riscos $(subst $(SOURCESDIR)/,,$@) $(UPSTREAM_INFOZIP_URI) $@
 
 ###
 # Rule to create buildsteps dir
diff --git a/x86_64-w64-mingw32/Makefile b/x86_64-w64-mingw32/Makefile
index c81cebd..240411b 100644
--- a/x86_64-w64-mingw32/Makefile
+++ b/x86_64-w64-mingw32/Makefile
@@ -21,7 +21,7 @@ UPSTREAM_MPFR_URI := http://www.mpfr.org/mpfr-$(UPSTREAM_MPFR_VERSION)/$(UPSTREA
 
 UPSTREAM_MPC_VERSION := 0.8.2
 UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz
-UPSTREAM_MPC_URI := http://www.multiprecision.org/mpc/download/$(UPSTREAM_MPC_TARBALL)
+UPSTREAM_MPC_URI := http://www.multiprecision.org/downloads/$(UPSTREAM_MPC_TARBALL)
 
 UPSTREAM_MINGW_VERSION := 3.3.0
 UPSTREAM_MINGW_TARBALL := mingw-w64-v$(UPSTREAM_MINGW_VERSION).tar.bz2
@@ -172,4 +172,4 @@ $(SOURCESDIR):
 	mkdir -p $(SOURCESDIR)
 
 $(SRCDIR):
-	mkdir -p $(SRCDIR)
\ No newline at end of file
+	mkdir -p $(SRCDIR)