From 0b6a7dabc74a4f780f5077915db48d5a03b0398f Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Sun, 28 Feb 2016 16:07:59 +0000
Subject: Fix fetch and extraction of gcc and binutils

---
 ppc-amigaos/Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ppc-amigaos/Makefile b/ppc-amigaos/Makefile
index 6cbd968..51d0c87 100644
--- a/ppc-amigaos/Makefile
+++ b/ppc-amigaos/Makefile
@@ -117,7 +117,8 @@ $(BUILDSTEPS)/srcdir-step2.d: $(BUILDSTEPS)/srcdir-step1.d $(SOURCESDIR)/$(UPSTR
 	touch $@
 
 $(BUILDSTEPS)/srcdir-step1.d: $(BUILDSTEPS)/$(UPSTREAM_GCC_TARBALL).d
-	cp -r $(SOURCESDIR)/$(UPSTREAM_GCC_TARBALL) $(GCC_SRCDIR)
+	tar xjf $(SOURCESDIR)/$(UPSTREAM_GCC_TARBALL)
+	mv gcc-$(UPSTREAM_GCC_VERSION) $(GCC_SRCDIR)
 	touch $@
 
 $(BUILDSTEPS)/$(UPSTREAM_GCC_TARBALL).d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR)/$(UPSTREAM_GCC_TARBALL)
@@ -135,7 +136,8 @@ $(BUILDSTEPS)/binutils.d: $(BUILDSTEPS)/binutils-srcdir.d
 	touch $@
 
 $(BUILDSTEPS)/binutils-srcdir.d: $(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL)
-	cp -r $(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL) $(BINUTILS_SRCDIR)
+	tar xjf $(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL)
+	mv binutils-$(UPSTREAM_BINUTILS_VERSION) $(BINUTILS_SRCDIR)
 	for p in `ls $(RECIPES)/patches/binutils/*.p` ; do patch -d $(BINUTILS_SRCDIR) -p0 <$$p ; done
 	touch $@
 
@@ -144,7 +146,7 @@ $(BUILDSTEPS)/binutils-srcdir.d: $(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL)
 ###
 
 $(SOURCESDIR)/$(UPSTREAM_GCC_TARBALL):
-	svn co $(UPSTREAM_GCC_URI) $@
+	wget -q -O $@ $(UPSTREAM_GCC_URI)
 
 $(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL):
 	wget -q -O $@ $(UPSTREAM_GMP_URI)
@@ -156,7 +158,7 @@ $(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL):
 	wget -q -O $@ $(UPSTREAM_MPC_URI)
 
 $(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL):
-	svn co $(UPSTREAM_BINUTILS_URI) $@
+	wget -q -O $@ $(UPSTREAM_BINUTILS_URI)
 
 $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL):
 	wget -q -O $@ $(UPSTREAM_NDK_URI)
-- 
cgit v1.2.3