Gitweb links:

...log 
http://git.netsurf-browser.org/toolchains.git/shortlog/e72bca9f95a2a225d9c32a1a4eed9cf3e5148f40
...commit 
http://git.netsurf-browser.org/toolchains.git/commit/e72bca9f95a2a225d9c32a1a4eed9cf3e5148f40
...tree 
http://git.netsurf-browser.org/toolchains.git/tree/e72bca9f95a2a225d9c32a1a4eed9cf3e5148f40

The branch, chris/gcc6-os3 has been updated
       via  e72bca9f95a2a225d9c32a1a4eed9cf3e5148f40 (commit)
       via  052981c355a0839d6f51d119038823703c9f78f5 (commit)
      from  f114daf8f1208d8fc501696f3de5a7d7e6e039ac (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commitdiff 
http://git.netsurf-browser.org/toolchains.git/commit/?id=e72bca9f95a2a225d9c32a1a4eed9cf3e5148f40
commit e72bca9f95a2a225d9c32a1a4eed9cf3e5148f40
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>

    Delete gcc-ranlib as libtool tries to use it and it doesn't work
    libtool uses ranlib without --plugin if this doesn't exist

diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 48e7975..002dc8d 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -148,6 +148,7 @@ $(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/bison.d 
$(BUILDSTEPS)/srcdir-s
                                --without-headers
        cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make all-gcc
        cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make install-gcc
+       rm $(PREFIX)/bin/$(TARGET_NAME)-gcc-ranlib
        touch $@
 
 ###


commitdiff 
http://git.netsurf-browser.org/toolchains.git/commit/?id=052981c355a0839d6f51d119038823703c9f78f5
commit 052981c355a0839d6f51d119038823703c9f78f5
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>

    Use bebbo's binutils

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 ();
-               }
-           }


-----------------------------------------------------------------------

Summary of changes:
 m68k-unknown-amigaos/Makefile                             |   13 +++++++------
 m68k-unknown-amigaos/recipes/patches/binutils/gas.app.c.p |   13 -------------
 2 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 m68k-unknown-amigaos/recipes/patches/binutils/gas.app.c.p

diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 31df799..002dc8d 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
@@ -149,6 +148,7 @@ $(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/bison.d 
$(BUILDSTEPS)/srcdir-s
                                --without-headers
        cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make all-gcc
        cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make install-gcc
+       rm $(PREFIX)/bin/$(TARGET_NAME)-gcc-ranlib
        touch $@
 
 ###
@@ -214,7 +214,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 +236,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 ();
-               }
-           }


-- 
Cross-compilation toolchains and environments

_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org

Reply via email to