[RSB 1/2] gcc: Move GMP, MPC, MPFR sources to common
Sebastian Huber
sebastian.huber at embedded-brains.de
Fri Apr 22 06:47:18 UTC 2022
Use GCC infrastructure download directory for GCC prerequisites.
---
source-builder/config/gcc-4.3-1.cfg | 7 -------
source-builder/config/gcc-4.4-1.cfg | 7 -------
source-builder/config/gcc-4.5-1.cfg | 7 -------
source-builder/config/gcc-4.6-1.cfg | 7 -------
source-builder/config/gcc-4.7-1.cfg | 7 -------
source-builder/config/gcc-4.8-1.cfg | 7 -------
source-builder/config/gcc-4.9-1.cfg | 7 -------
source-builder/config/gcc-6-1.cfg | 7 -------
source-builder/config/gcc-7-1.cfg | 7 -------
source-builder/config/gcc-7.2-1.cfg | 7 -------
source-builder/config/gcc-9.cfg | 4 ----
source-builder/config/gcc-common-1.cfg | 3 +++
12 files changed, 3 insertions(+), 74 deletions(-)
diff --git a/source-builder/config/gcc-4.3-1.cfg b/source-builder/config/gcc-4.3-1.cfg
index 69ea367..24d4010 100644
--- a/source-builder/config/gcc-4.3-1.cfg
+++ b/source-builder/config/gcc-4.3-1.cfg
@@ -23,13 +23,6 @@
#
%source set newlib https://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz
-#
-# Packages GCC requires
-#
-%source set mpfr http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%source set mpc http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%source set gmp https://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-
#
# GCC Common build script.
#
diff --git a/source-builder/config/gcc-4.4-1.cfg b/source-builder/config/gcc-4.4-1.cfg
index 2c70919..c6ae586 100644
--- a/source-builder/config/gcc-4.4-1.cfg
+++ b/source-builder/config/gcc-4.4-1.cfg
@@ -22,13 +22,6 @@
#
%source set newlib https://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz
-#
-# Packages GCC requires
-#
-%source set mpfr http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%source set mpc http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%source set gmp https://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-
#
# GCC Common build script.
#
diff --git a/source-builder/config/gcc-4.5-1.cfg b/source-builder/config/gcc-4.5-1.cfg
index fbff31c..8a9f8ca 100644
--- a/source-builder/config/gcc-4.5-1.cfg
+++ b/source-builder/config/gcc-4.5-1.cfg
@@ -18,13 +18,6 @@
#
%source set newlib https://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz
-#
-# Packages GCC requires
-#
-%source set mpfr http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%source set mpc http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%source set gmp https://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-
#
# GCC Common build script.
#
diff --git a/source-builder/config/gcc-4.6-1.cfg b/source-builder/config/gcc-4.6-1.cfg
index 98f8d7e..cecfdb5 100644
--- a/source-builder/config/gcc-4.6-1.cfg
+++ b/source-builder/config/gcc-4.6-1.cfg
@@ -22,13 +22,6 @@
#
%source set newlib https://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz
-#
-# Packages GCC requires
-#
-%source set mpfr http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%source set mpc http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%source set gmp https://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-
#
# GCC Common build script.
#
diff --git a/source-builder/config/gcc-4.7-1.cfg b/source-builder/config/gcc-4.7-1.cfg
index 0eac21f..79a50db 100644
--- a/source-builder/config/gcc-4.7-1.cfg
+++ b/source-builder/config/gcc-4.7-1.cfg
@@ -27,13 +27,6 @@
#
%source set newlib https://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz
-#
-# Packages GCC requires
-#
-%source set mpfr http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%source set mpc http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%source set gmp https://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-
#
# GCC Common build script.
#
diff --git a/source-builder/config/gcc-4.8-1.cfg b/source-builder/config/gcc-4.8-1.cfg
index aa62837..b2d4208 100644
--- a/source-builder/config/gcc-4.8-1.cfg
+++ b/source-builder/config/gcc-4.8-1.cfg
@@ -18,13 +18,6 @@
#
%source set newlib https://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz
-#
-# Packages GCC requires
-#
-%source set mpfr http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%source set mpc http://www.multiprecision.org/downloads/mpc-%{mpc_version}.tar.gz
-%source set gmp https://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-
#
# GCC Common build script.
#
diff --git a/source-builder/config/gcc-4.9-1.cfg b/source-builder/config/gcc-4.9-1.cfg
index e28b560..73d2e4c 100644
--- a/source-builder/config/gcc-4.9-1.cfg
+++ b/source-builder/config/gcc-4.9-1.cfg
@@ -18,13 +18,6 @@
#
%source set newlib https://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz
-#
-# Packages GCC requires
-#
-%source set mpfr http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%source set mpc http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%source set gmp https://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-
%patch add gcc --rsb-file=Make-lang.in-b09fb02bb4c0d16fc2c842bec4069c033897b5f2.patch -p1 https://gcc.gnu.org/git/?p=gcc.git;a=blobdiff_plain;f=gcc/cp/Make-lang.in;h=b09fb02bb4c0d16fc2c842bec4069c033897b5f2;hp=e98beb1e33e4bcc4943361c559ae71b7eb345346;hb=1e5f1089dec3af328fd03125d6778f666d0bd4e4;hpb=88375bb2ba8b9004a9924cdae894d7ff32972652
%hash sha512 Make-lang.in-b09fb02bb4c0d16fc2c842bec4069c033897b5f2.patch a47511de21fda0c0c314577ee295b8f2bc9f555084ceca88de12c931ebfe47e5fec349682085a7a1e8637e8e159b8f79188a56d42e54fda2ba5161d5bd3f56ac
%patch add gcc --rsb-file=cfns.gperf.b09fb02bb4c0d16fc2c842bec4069c033897b5f2.patch -p1 https://gcc.gnu.org/git/?p=gcc.git;a=blobdiff_plain;f=gcc/cp/cfns.gperf;h=b09fb02bb4c0d16fc2c842bec4069c033897b5f2;hp=e98beb1e33e4bcc4943361c559ae71b7eb345346;hb=1e5f1089dec3af328fd03125d6778f666d0bd4e4;hpb=88375bb2ba8b9004a9924cdae894d7ff32972652
diff --git a/source-builder/config/gcc-6-1.cfg b/source-builder/config/gcc-6-1.cfg
index 842ec35..2a2e3ec 100644
--- a/source-builder/config/gcc-6-1.cfg
+++ b/source-builder/config/gcc-6-1.cfg
@@ -18,13 +18,6 @@
#
%source set newlib https://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz
-#
-# Packages GCC requires
-#
-%source set mpfr http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2
-%source set mpc http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz
-%source set gmp https://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-
#
# GCC Common build script.
#
diff --git a/source-builder/config/gcc-7-1.cfg b/source-builder/config/gcc-7-1.cfg
index 5160968..06a790f 100644
--- a/source-builder/config/gcc-7-1.cfg
+++ b/source-builder/config/gcc-7-1.cfg
@@ -18,13 +18,6 @@
#
%source set newlib https://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz
-#
-# Packages GCC requires
-#
-%source set mpfr https://ftp.gnu.org/gnu/mpfr/mpfr-%{mpfr_version}.tar.bz2
-%source set mpc https://ftp.gnu.org/gnu/mpc/mpc-%{mpc_version}.tar.gz
-%source set gmp https://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-
#
# GCC Common build script.
#
diff --git a/source-builder/config/gcc-7.2-1.cfg b/source-builder/config/gcc-7.2-1.cfg
index 893a2f5..3f3ee03 100644
--- a/source-builder/config/gcc-7.2-1.cfg
+++ b/source-builder/config/gcc-7.2-1.cfg
@@ -18,13 +18,6 @@
#
%source set newlib https://sourceware.org/pub/newlib/newlib-%{newlib_version}.tar.gz
-#
-# Packages GCC requires
-#
-%source set mpfr https://ftp.gnu.org/gnu/mpfr/mpfr-%{mpfr_version}.tar.bz2
-%source set mpc https://ftp.gnu.org/gnu/mpc/mpc-%{mpc_version}.tar.gz
-%source set gmp https://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-
#
# GCC Common build script.
#
diff --git a/source-builder/config/gcc-9.cfg b/source-builder/config/gcc-9.cfg
index f8cf69b..e076d63 100644
--- a/source-builder/config/gcc-9.cfg
+++ b/source-builder/config/gcc-9.cfg
@@ -17,8 +17,4 @@
%define gmp_version 6.1.0
%hash sha512 gmp-6.1.0.tar.bz2 3c82aeab9c1596d4da8afac2eec38e429e84f3211e1a572cf8fd2b546493c44c039b922a1133eaaa48bd7f3e11dbe795a384e21ed95cbe3ecc58d7ac02246117
-%source set mpc https://ftp.gnu.org/gnu/mpc/mpc-%{mpc_version}.tar.gz
-%source set gmp https://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2
-%source set mpfr https://ftp.gnu.org/gnu/mpfr/mpfr-%{mpfr_version}.tar.bz2
-
%include %{_configdir}/gcc-common-1.cfg
diff --git a/source-builder/config/gcc-common-1.cfg b/source-builder/config/gcc-common-1.cfg
index 4e13efc..9f4805c 100644
--- a/source-builder/config/gcc-common-1.cfg
+++ b/source-builder/config/gcc-common-1.cfg
@@ -55,6 +55,9 @@ URL: http://gcc.gnu.org/
%if %{defined isl_version}
%source set isl https://gcc.gnu.org/pub/gcc/infrastructure/isl-%{isl_version}.tar.bz2
%endif
+%source set mpc https://gcc.gnu.org/pub/gcc/infrastructure/mpc-%{mpc_version}.tar.gz
+%source set gmp https://gcc.gnu.org/pub/gcc/infrastructure/gmp-%{gmp_version}.tar.bz2
+%source set mpfr https://gcc.gnu.org/pub/gcc/infrastructure/mpfr-%{mpfr_version}.tar.bz2
#
# Prepare the source code.
--
2.34.1
More information about the devel
mailing list