diff options
author | Chris Johns <chrisj@rtems.org> | 2023-11-24 15:32:58 +1100 |
---|---|---|
committer | Chris Johns <chrisj@rtems.org> | 2023-11-28 18:17:11 +1100 |
commit | 9e57632befb687e0d5306af47dabcec19cb5d50e (patch) | |
tree | 1d9a50446aee8a1c4692010aeb0ed3b7f324f47a /source-builder | |
parent | rtems/rtems-tools: Update with C++17 and Python 3.12 fixes (diff) | |
download | rtems-source-builder-9e57632befb687e0d5306af47dabcec19cb5d50e.tar.bz2 |
6: Fix gcc-13 support for MacOS
Update #4921
Diffstat (limited to 'source-builder')
-rw-r--r-- | source-builder/config/gcc-13.cfg | 26 | ||||
-rw-r--r-- | source-builder/config/gmp.cfg | 17 |
2 files changed, 37 insertions, 6 deletions
diff --git a/source-builder/config/gcc-13.cfg b/source-builder/config/gcc-13.cfg new file mode 100644 index 0000000..19b514a --- /dev/null +++ b/source-builder/config/gcc-13.cfg @@ -0,0 +1,26 @@ +# +# GCC 13 +# +# This configuration file configure's, make's and install's gcc. It uses +# newlib, ISL, MPFR and MPC in a one-tree build configuration. +# + +%define isl_version 0.24 +%hash sha512 isl-%{isl_version}.tar.bz2 \ + qrO929qWuAHQ9W0oaflDFXqtUqb25qYXRe3XQCNMY1w4IxryC8PxoI1Bal6XOpDhgkkHjtjkri8dXeV2WHOOlQ== +# See #4657 +%patch add isl -p1 https://devel.rtems.org/raw-attachment/ticket/4657/fix-mac-arm64-isl-config.patch +%hash sha512 fix-mac-arm64-isl-config.patch \ + wH/bYFplINGUNYUEcx5jtUAhHvaAOD8cpOxltKxDridodTT9fYGWpNvoOg7PLEKkJUxx5gnuSEp2FFc7xJmi6A== + +%define mpfr_version 4.2.1 +%define mpfr_url https://ftp.gnu.org/gnu/mpfr +%hash sha512 mpfr-%{mpfr_version}.tar.bz2 \ + yBhCUy7MZjNI3rdADZEa1xkz07Ulovnlrc0EJlycD90fIuyiKfSCcDrH8iLvIJ/J4zndH6R9cq5X9/cLIzanbw== + +%define mpc_version 1.3.1 +%define mpc_url https://ftp.gnu.org/gnu/mpc +%hash sha512 mpc-%{mpc_version}.tar.gz \ + S6tO9gdvjF39yZ2BC1EQjO1h6ilCugwcky1iQ2ClRz3yDTKzAPx28rpKoql+Hydcn9SUobqfB8TLKtfOrrGulw== + +%include %{_configdir}/gcc-common-1.cfg diff --git a/source-builder/config/gmp.cfg b/source-builder/config/gmp.cfg index 4e8d674..352caef 100644 --- a/source-builder/config/gmp.cfg +++ b/source-builder/config/gmp.cfg @@ -15,17 +15,22 @@ Release: %{release} URL: https://gmplib.org/ # -# Source +# Allow the user to override the UURL # -%source set gmp https://gcc.gnu.org/pub/gcc/infrastructure/gmp-%{gmp_version}.tar.bz2 +%if %{!defined gmp_url} + %define gmp_url https://gmplib.org/download/gmp +%endif -%define gmp_extra_options %{nil} +# +# Source +# +%source set gmp %{gmp_url}/gmp-%{gmp_version}.tar.bz2 # -# Do not use assembler if MacOS AARCH64 +# Allow extra options # -%if %{_host_os} == darwin && %{_host_arch} == arm64 - %define gmp_extra_options %{gmp_extra_options} --disable-assembly +%if %{!defined gmp_extra_options} + %define gmp_extra_options %{nil} %endif # |