summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2018-01-26 11:52:54 +0000
committerVincent Sanders <vince@kyllikki.org>2018-01-26 11:52:54 +0000
commit78a4513494d093f493072e185482afd41758aae1 (patch)
tree75a005a64742a0a28c7ffea6c6f3dea386c2d383
parent43963a8ca61715903a1d47cfba6b3c45ce4f3f03 (diff)
downloadtoolchains-78a4513494d093f493072e185482afd41758aae1.tar.gz
toolchains-78a4513494d093f493072e185482afd41758aae1.tar.bz2
cache more source components on teh ci infrastructure
-rw-r--r--arm-unknown-riscos/Makefile16
-rwxr-xr-xarm-unknown-riscos/fetchsrc16
-rw-r--r--arm-unknown-riscos/recipes/patches/gcc4/binutils-download.p12
-rw-r--r--arm-unknown-riscos/recipes/patches/gcc4/cloog-ppl-download.p12
-rw-r--r--arm-unknown-riscos/recipes/patches/gcc4/gmp-download.p11
-rw-r--r--arm-unknown-riscos/recipes/patches/gcc4/ppl-download.p27
6 files changed, 88 insertions, 6 deletions
diff --git a/arm-unknown-riscos/Makefile b/arm-unknown-riscos/Makefile
index 3dd334a..dc7c72d 100644
--- a/arm-unknown-riscos/Makefile
+++ b/arm-unknown-riscos/Makefile
@@ -1,6 +1,6 @@
# Use a tested trunk version of GCCSDK
-UPSTREAM_GCCSDK_TARBALL := gcc4
UPSTREAM_GCCSDK_VERSION := release_4_7_4_v2
+UPSTREAM_GCCSDK_TARBALL := gcc4$(UPSTREAM_GCCSDK_VERSION).tar.gz
UPSTREAM_GCCSDK_URI := svn://svn.riscos.info/gccsdk/tags/$(UPSTREAM_GCCSDK_VERSION)
# OSLib 7.00
@@ -38,6 +38,9 @@ TARGET_NAME := arm-unknown-riscos
PREFIX ?= /opt/netsurf/$(TARGET_NAME)
+# tools
+FETCHSRC:=$(CURDIR)/fetchsrc
+
.PHONY: all clean distclean
all: $(BUILDSTEPS)/toolchain.d
@@ -59,7 +62,7 @@ $(BUILDSTEPS)/toolchain.d: $(BUILDSTEPS)/ccres.d $(BUILDSTEPS)/makerun.d $(BUILD
###
$(BUILDSTEPS)/infozip.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_INFOZIP_TARBALL)
- tar -C $(BUILDDIR) -xzf $(SOURCESDIR)/$(UPSTREAM_INFOZIP_TARBALL)
+ tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_INFOZIP_TARBALL)
for p in `ls $(RECIPES)/patches/infozip/*.p` ; do patch -d $(BUILDDIR)/zip$(UPSTREAM_INFOZIP_VERSION) -p0 <$$p ; done
cd $(BUILDDIR)/zip$(UPSTREAM_INFOZIP_VERSION) && make -f unix/Makefile generic LOCAL_ZIP=-DFORRISCOS
cp $(BUILDDIR)/zip$(UPSTREAM_INFOZIP_VERSION)/zip $(PREFIX)/cross/bin/zip
@@ -119,7 +122,7 @@ $(BUILDSTEPS)/gcc.d: $(BUILDSTEPS)/gccsdk-srcdir.d
touch $@
$(BUILDSTEPS)/gccsdk-srcdir.d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL)
- cp -r $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL) $(BUILDDIR)/gcc4
+ tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL)
cp -p $(RECIPES)/files/gcc4/gccsdk-params $(BUILDDIR)/gcc4/gcc4/gccsdk-params
cp -p $(RECIPES)/files/gcc4/*.p $(BUILDDIR)/gcc4/gcc4/recipe/patches/gcc/
sed -i 's#{PREFIX}#$(PREFIX)#' $(BUILDDIR)/gcc4/gcc4/gccsdk-params
@@ -131,7 +134,8 @@ $(BUILDSTEPS)/gccsdk-srcdir.d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR)/$(UPSTRE
###
$(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL):
- svn co $(UPSTREAM_GCCSDK_URI) $@
+ svn co $(UPSTREAM_GCCSDK_URI) $(SOURCESDIR)/gcc4
+ tar -C $(SOURCESDIR) -caf $@ gcc4
$(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL):
svn co $(UPSTREAM_OSLIB_URI) $@
@@ -145,8 +149,8 @@ $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TARBALL):
$(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TARBALL):
git clone $(UPSTREAM_SQUEEZE_URI) $@
-$(SOURCESDIR)/$(UPSTREAM_INFOZIP_TARBALL):
- wget -q -O $@ $(UPSTREAM_INFOZIP_URI)
+$(SOURCEDIR)/$(UPSTREAM_INFOZIP_TARBALL):
+ $(FETCHSRC) arm-unknown-riscos $(subst $(SOURCEDIR)/,,$@) $(UPSTREAM_INFOZIP_URI) $@
###
# Rule to create buildsteps dir
diff --git a/arm-unknown-riscos/fetchsrc b/arm-unknown-riscos/fetchsrc
new file mode 100755
index 0000000..e71d85f
--- /dev/null
+++ b/arm-unknown-riscos/fetchsrc
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# script to fetch toolchain source tar using ci.netsurf-browser.org as a cache
+
+# Usage fetchsrc <target> <source> <upstream> <output>
+
+NSSRV="http://ci.netsurf-browser.org/toolchain/"
+
+wget -q -O ${4} ${NSSRV}/${1}/${2}
+if [ $? -ne 0 ];then
+ wget -q -O ${4} ${3}
+ if [ $? -ne 0 ];then
+ rm ${4}
+ exit 1
+ fi
+fi
diff --git a/arm-unknown-riscos/recipes/patches/gcc4/binutils-download.p b/arm-unknown-riscos/recipes/patches/gcc4/binutils-download.p
new file mode 100644
index 0000000..54720f5
--- /dev/null
+++ b/arm-unknown-riscos/recipes/patches/gcc4/binutils-download.p
@@ -0,0 +1,12 @@
+--- gcc4/Makefile.orig 2018-01-26 10:37:32.006594122 +0000
++++ gcc4/Makefile 2018-01-26 10:38:42.316723336 +0000
+@@ -677,8 +677,7 @@
+ # Download binutils source:
+ $(SRCORIGDIR)/binutils-$(BINUTILS_VERSION).tar.bz2:
+ -mkdir -p $(SRCORIGDIR)
+- cd $(SRCORIGDIR) && wget -c http://ftpmirror.gnu.org/binutils/binutils-$(BINUTILS_VERSION).tar.bz2
+- touch $@
++ wget -O $@ -c http://ci.netsurf-browser.org/toolchain/arm-unknown-riscos/binutils-$(BINUTILS_VERSION).tar.bz2
+
+ ifeq "$(GCC_USE_SCM)" "yes"
+ # Checkout gcc source:
diff --git a/arm-unknown-riscos/recipes/patches/gcc4/cloog-ppl-download.p b/arm-unknown-riscos/recipes/patches/gcc4/cloog-ppl-download.p
new file mode 100644
index 0000000..194ef7f
--- /dev/null
+++ b/arm-unknown-riscos/recipes/patches/gcc4/cloog-ppl-download.p
@@ -0,0 +1,12 @@
+--- gcc4/Makefile.orig 2018-01-26 10:40:26.623881778 +0000
++++ gcc4/Makefile 2018-01-26 10:41:24.141623273 +0000
+@@ -719,8 +719,7 @@
+ # Download CLooG source:
+ $(SRCORIGDIR)/cloog-ppl-$(CLOOG_VERSION).tar.gz:
+ -mkdir -p $(SRCORIGDIR)
+- cd $(SRCORIGDIR) && wget -c ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-$(CLOOG_VERSION).tar.gz
+- touch $@
++ wget -O $@ -c http://ci.netsurf-browser.org/toolchain/arm-unknown-riscos/cloog-ppl-$(CLOOG_VERSION).tar.gz
+
+ # Download newlib source:
+ $(SRCORIGDIR)/newlib-$(NEWLIB_VERSION).tar.gz:
diff --git a/arm-unknown-riscos/recipes/patches/gcc4/gmp-download.p b/arm-unknown-riscos/recipes/patches/gcc4/gmp-download.p
new file mode 100644
index 0000000..0bfd4ec
--- /dev/null
+++ b/arm-unknown-riscos/recipes/patches/gcc4/gmp-download.p
@@ -0,0 +1,11 @@
+--- gcc4/Makefile.orig 2018-01-25 22:42:43.937180762 +0000
++++ gcc4/Makefile 2018-01-25 22:44:46.680863288 +0000
+@@ -703,7 +703,7 @@
+ # Download mpc source:
+ $(SRCORIGDIR)/mpc-$(MPC_VERSION).tar.gz:
+ -mkdir -p $(SRCORIGDIR)
+- cd $(SRCORIGDIR) && wget -c http://www.multiprecision.org/mpc/download/mpc-$(MPC_VERSION).tar.gz
++ cd $(SRCORIGDIR) && wget -c http://ci.netsurf-browser.org/toolchain/arm-unknown-riscos/mpc-$(MPC_VERSION).tar.gz
+ touch $@
+
+ # Download mpfr source:
diff --git a/arm-unknown-riscos/recipes/patches/gcc4/ppl-download.p b/arm-unknown-riscos/recipes/patches/gcc4/ppl-download.p
new file mode 100644
index 0000000..7eb77c3
--- /dev/null
+++ b/arm-unknown-riscos/recipes/patches/gcc4/ppl-download.p
@@ -0,0 +1,27 @@
+--- gcc4/Makefile.orig 2018-01-26 08:03:49.745541843 +0000
++++ gcc4/Makefile 2018-01-26 08:05:15.256056177 +0000
+@@ -586,9 +586,9 @@
+ touch $(BUILDSTEPSDIR)/$@
+
+ # Unpack & copy ppl source:
+-src-ppl-copied: $(SRCORIGDIR)/ppl-$(PPL_VERSION).tar.gz
++src-ppl-copied: $(SRCORIGDIR)/ppl-$(PPL_VERSION).tar.xz
+ -rm -rf $(SRCORIGDIR)/ppl-$(PPL_VERSION) $(SRCDIR)/ppl
+- cd $(SRCORIGDIR) && tar xf $<
++ cd $(SRCORIGDIR) && tar axf $<
+ -mkdir -p $(SRCDIR)/ppl
+ cp -T -p -r $(SRCORIGDIR)/ppl-$(PPL_VERSION) $(SRCDIR)/ppl
+ cd $(SRCDIR)/ppl && PATH="$(PREFIX_BUILDTOOL_GCC)/bin:$(PATH)" && $(SCRIPTSDIR)/do-patch-and-copy $(RECIPEDIR)
+@@ -713,10 +713,9 @@
+ touch $@
+
+ # Download ppl source:
+-$(SRCORIGDIR)/ppl-$(PPL_VERSION).tar.gz:
++$(SRCORIGDIR)/ppl-$(PPL_VERSION).tar.xz:
+ -mkdir -p $(SRCORIGDIR)
+- cd $(SRCORIGDIR) && wget -c http://www.cs.unipr.it/ppl/download/ftp/releases/$(PPL_VERSION)/ppl-$(PPL_VERSION).tar.gz
+- touch $@
++ wget -O $@ -c http://ci.netsurf-browser.org/toolchain/arm-unknown-riscos/ppl-$(PPL_VERSION).tar.xz
+
+ # Download CLooG source:
+ $(SRCORIGDIR)/cloog-ppl-$(CLOOG_VERSION).tar.gz: