rtems/rtems-source-builder
1
0
Fork 0
mirror of https://git.rtems.org/rtems-source-builder synced 2024-10-09 07:15:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

rtems/gcc: Do not build GMP in GCC, use the staged build

Browse Source 
- 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
This commit is contained in:
Chris Johns 2023-04-04 13:43:16 +10:00
parent 9919f1217c
commit f3c5dbdce6
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source-builder/config/gcc-common-1.cfg
View File

@ -58,9 +58,6 @@ URL: http://gcc.gnu.org/
%if %{!defined mpc_url} %if %{!defined mpc_url}
%define mpc_url https://gcc.gnu.org/pub/gcc/infrastructure %define mpc_url https://gcc.gnu.org/pub/gcc/infrastructure
%endif %endif
%if %{!defined gmp_url}
%define gmp_url https://gcc.gnu.org/pub/gcc/infrastructure
%endif
%if %{!defined mpfr_url} %if %{!defined mpfr_url}
%define mpfr_url https://gcc.gnu.org/pub/gcc/infrastructure %define mpfr_url https://gcc.gnu.org/pub/gcc/infrastructure
%endif %endif
@ -75,7 +72,6 @@ URL: http://gcc.gnu.org/
%source set isl %{isl_url}/isl-%{isl_version}.tar.bz2 %source set isl %{isl_url}/isl-%{isl_version}.tar.bz2
%endif %endif
%source set mpc %{mpc_url}/mpc-%{mpc_version}.tar.gz %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 %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 %{__ln_s} $PWD/${source_dir_isl} ${source_dir_gcc}/isl
%endif %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 # MPC
source_dir_mpc="mpc-%{mpc_version}" source_dir_mpc="mpc-%{mpc_version}"
%source setup mpc -q -D -n 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 %{__rmfile} ${source_dir_gcc}/mpc
%{__ln_s} $PWD/${source_dir_mpc} ${source_dir_gcc}/mpc %{__ln_s} $PWD/${source_dir_mpc} ${source_dir_gcc}/mpc
# GMP # MPFR
source_dir_gmp="gmp-%{gmp_version}" source_dir_mpfr="mpfr-%{mpfr_version}"
%source setup gmp -q -D -n gmp-%{gmp_version} %source setup mpfr -q -D -n mpfr-%{mpfr_version}
%patch setup gmp -p1 %patch setup mpfr -p1
cd ${build_top} cd ${build_top}
# Build GMP one-tree style # Build MPFR one-tree style
%{__rmfile} ${source_dir_gcc}/gmp %{__rmfile} ${source_dir_gcc}/mpfr
%{__ln_s} $PWD/${source_dir_gmp} ${source_dir_gcc}/gmp %{__ln_s} $PWD/${source_dir_mpfr} ${source_dir_gcc}/mpfr
echo "%{gcc_version_message}" > ${source_dir_gcc}/gcc/DEV-PHASE 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 cp ../${source_dir_gcc}/gcc/gsyslimits.h gcc/include/syslimits.h
fi fi
%{__make} %{?_smp_mflags} all %{__make} -w %{?_smp_mflags} all
cd ${build_top} cd ${build_top}