From 3cb936c6440affd4218edc901ec0cf24f048fa2b Mon Sep 17 00:00:00 2001 From: John-Mark Bell Date: Sat, 28 May 2022 18:17:22 +0100 Subject: arm-unknown-riscos: drop GCC download patches Not useful if the CI cache doesn't have the things we need --- .../recipes/patches/gcc4/binutils-download.p | 12 ---------- .../recipes/patches/gcc4/cloog-ppl-download.p | 12 ---------- .../recipes/patches/gcc4/gmp-download.p | 11 --------- .../recipes/patches/gcc4/ppl-download.p | 27 ---------------------- 4 files changed, 62 deletions(-) delete mode 100644 arm-unknown-riscos/recipes/patches/gcc4/binutils-download.p delete mode 100644 arm-unknown-riscos/recipes/patches/gcc4/cloog-ppl-download.p delete mode 100644 arm-unknown-riscos/recipes/patches/gcc4/gmp-download.p delete mode 100644 arm-unknown-riscos/recipes/patches/gcc4/ppl-download.p diff --git a/arm-unknown-riscos/recipes/patches/gcc4/binutils-download.p b/arm-unknown-riscos/recipes/patches/gcc4/binutils-download.p deleted file mode 100644 index 3f2f110..0000000 --- a/arm-unknown-riscos/recipes/patches/gcc4/binutils-download.p +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 https://ftpmirror.gnu.org/binutils/binutils-$(BINUTILS_VERSION).tar.bz2 -- touch $@ -+ wget -O $@ -c https://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 deleted file mode 100644 index 6f91911..0000000 --- a/arm-unknown-riscos/recipes/patches/gcc4/cloog-ppl-download.p +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 https://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 deleted file mode 100644 index 4f99d57..0000000 --- a/arm-unknown-riscos/recipes/patches/gcc4/gmp-download.p +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 https://ftpmirror.gnu.org/mpc/mpc-$(MPC_VERSION).tar.gz -+ cd $(SRCORIGDIR) && wget -c https://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 deleted file mode 100644 index 128e9eb..0000000 --- a/arm-unknown-riscos/recipes/patches/gcc4/ppl-download.p +++ /dev/null @@ -1,27 +0,0 @@ ---- 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 https://www.bugseng.com/external/ppl/download/ftp/releases/$(PPL_VERSION)/ppl-$(PPL_VERSION).tar.gz -- touch $@ -+ wget -O $@ -c https://ci.netsurf-browser.org/toolchain/arm-unknown-riscos/ppl-$(PPL_VERSION).tar.xz - - # Download CLooG source: - $(SRCORIGDIR)/cloog-ppl-$(CLOOG_VERSION).tar.gz: -- cgit v1.2.3