diff options
author | Chris Johns <chris@contemporary.net.au> | 2023-04-04 13:43:16 +1000 |
---|---|---|
committer | Chris Johns <chris@contemporary.net.au> | 2023-04-05 10:09:29 +1000 |
commit | f3c5dbdce6472da91c3c3a26c44d78c10474498f (patch) | |
tree | 5515720478aea1bb816139399cb417288d68d6da | |
parent | 9919f1217c66dad5e721802a265cdbdcf6070069 (diff) |
rtems/gcc: Do not build GMP in GCC, use the staged build
- Do not build GMP when building GCC. GMP is now built
as a package for GDB. Building as a separate package
lets use control how it is built.
Updates #4892
-rw-r--r-- | source-builder/config/gcc-common-1.cfg | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/source-builder/config/gcc-common-1.cfg b/source-builder/config/gcc-common-1.cfg index 933202a..42c8a7b 100644 --- a/source-builder/config/gcc-common-1.cfg +++ b/source-builder/config/gcc-common-1.cfg @@ -58,9 +58,6 @@ URL: http://gcc.gnu.org/ %if %{!defined mpc_url} %define mpc_url https://gcc.gnu.org/pub/gcc/infrastructure %endif -%if %{!defined gmp_url} - %define gmp_url https://gcc.gnu.org/pub/gcc/infrastructure -%endif %if %{!defined mpfr_url} %define mpfr_url https://gcc.gnu.org/pub/gcc/infrastructure %endif @@ -75,7 +72,6 @@ URL: http://gcc.gnu.org/ %source set isl %{isl_url}/isl-%{isl_version}.tar.bz2 %endif %source set mpc %{mpc_url}/mpc-%{mpc_version}.tar.gz -%source set gmp %{gmp_url}/gmp-%{gmp_version}.tar.bz2 %source set mpfr %{mpfr_url}/mpfr-%{mpfr_version}.tar.bz2 # @@ -128,15 +124,6 @@ URL: http://gcc.gnu.org/ %{__ln_s} $PWD/${source_dir_isl} ${source_dir_gcc}/isl %endif - # MPFR - source_dir_mpfr="mpfr-%{mpfr_version}" - %source setup mpfr -q -D -n mpfr-%{mpfr_version} - %patch setup mpfr -p1 - cd ${build_top} - # Build MPFR one-tree style - %{__rmfile} ${source_dir_gcc}/mpfr - %{__ln_s} $PWD/${source_dir_mpfr} ${source_dir_gcc}/mpfr - # MPC source_dir_mpc="mpc-%{mpc_version}" %source setup mpc -q -D -n mpc-%{mpc_version} @@ -146,14 +133,14 @@ URL: http://gcc.gnu.org/ %{__rmfile} ${source_dir_gcc}/mpc %{__ln_s} $PWD/${source_dir_mpc} ${source_dir_gcc}/mpc - # GMP - source_dir_gmp="gmp-%{gmp_version}" - %source setup gmp -q -D -n gmp-%{gmp_version} - %patch setup gmp -p1 + # MPFR + source_dir_mpfr="mpfr-%{mpfr_version}" + %source setup mpfr -q -D -n mpfr-%{mpfr_version} + %patch setup mpfr -p1 cd ${build_top} - # Build GMP one-tree style - %{__rmfile} ${source_dir_gcc}/gmp - %{__ln_s} $PWD/${source_dir_gmp} ${source_dir_gcc}/gmp + # Build MPFR one-tree style + %{__rmfile} ${source_dir_gcc}/mpfr + %{__ln_s} $PWD/${source_dir_mpfr} ${source_dir_gcc}/mpfr echo "%{gcc_version_message}" > ${source_dir_gcc}/gcc/DEV-PHASE @@ -232,7 +219,7 @@ URL: http://gcc.gnu.org/ cp ../${source_dir_gcc}/gcc/gsyslimits.h gcc/include/syslimits.h fi - %{__make} %{?_smp_mflags} all + %{__make} -w %{?_smp_mflags} all cd ${build_top} |