diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2018-01-23 22:40:11 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2018-07-23 18:41:07 +0100 |
| commit | fa8a899e3ef02e0eeac2c06f099bcef8a1ce5f76 (patch) | |
| tree | b37c75f036fe48ca0591bdf6b3847f3d1b10c86b | |
| parent | 93bcfe7cd061aa3980f22dd48dc8404d6b85845d (diff) | |
| download | toolchains-fa8a899e3ef02e0eeac2c06f099bcef8a1ce5f76.tar.gz toolchains-fa8a899e3ef02e0eeac2c06f099bcef8a1ce5f76.tar.bz2 | |
Use bebbo's binutils
| -rw-r--r-- | m68k-unknown-amigaos/Makefile | 12 | ||||
| -rw-r--r-- | m68k-unknown-amigaos/recipes/patches/binutils/gas.app.c.p | 13 |
2 files changed, 6 insertions, 19 deletions
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile index 31df799..48e7975 100644 --- a/m68k-unknown-amigaos/Makefile +++ b/m68k-unknown-amigaos/Makefile @@ -7,10 +7,9 @@ UPSTREAM_GCC_VERSION := 6.4.1b-20180122 UPSTREAM_GCC_TARBALL := v$(UPSTREAM_GCC_VERSION).tar.gz UPSTREAM_GCC_URI := https://github.com/chris-y/gcc/archive/$(UPSTREAM_GCC_TARBALL) -UPSTREAM_BINUTILS_VERSION := 2.14 -# Not a tarball; so sue me -UPSTREAM_BINUTILS_TARBALL := binutils-$(UPSTREAM_BINUTILS_VERSION) -UPSTREAM_BINUTILS_URI := http://svn.code.sf.net/p/adtools/code/branches/binutils/$(UPSTREAM_BINUTILS_VERSION)/ +UPSTREAM_BINUTILS_VERSION := 2.14b +UPSTREAM_BINUTILS_TARBALL := v$(UPSTREAM_BINUTILS_VERSION) +UPSTREAM_BINUTILS_URI := https://github.com/chris-y/amigaos-binutils-2.14/archive/v$(UPSTREAM_BINUTILS_VERSION).tar.gz UPSTREAM_GMP_VERSION := 6.1.2 UPSTREAM_GMP_TARBALL := gmp-$(UPSTREAM_GMP_VERSION).tar.bz2 @@ -214,7 +213,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 axf $(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL) + mv amigaos-binutils-2.14-$(UPSTREAM_BINUTILS_VERSION) $(BINUTILS_SRCDIR) for p in `ls $(RECIPES)/patches/binutils/*.p` ; do patch -d $(BINUTILS_SRCDIR) -p0 <$$p ; done touch $@ @@ -235,7 +235,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_CLIB2_TARBALL): wget -q -O $@ $(UPSTREAM_CLIB2_URI) diff --git a/m68k-unknown-amigaos/recipes/patches/binutils/gas.app.c.p b/m68k-unknown-amigaos/recipes/patches/binutils/gas.app.c.p deleted file mode 100644 index 33124b5..0000000 --- a/m68k-unknown-amigaos/recipes/patches/binutils/gas.app.c.p +++ /dev/null @@ -1,13 +0,0 @@ -Index: gas/app.c -=================================================================== ---- gas/app.c (revision 240) -+++ gas/app.c (working copy) -@@ -1279,6 +1279,8 @@ - case 1: *to++ = *from++; - } - } -+ if (to >= toend) -+ goto tofull; - ch = GET (); - } - } |