Merge pull request #425 from skirpichev/mpc-1.3.1

Update GMP & MPC versions in scripts
aleaxit · Sep 6, 2023 · 2beaae2 · 2beaae2
2 parents eb56a3d + 482de07
commit 2beaae2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 529 deletions.
diff --git a/scripts/before_ci_build.sh b/scripts/before_ci_build.sh
@@ -1,14 +1,12 @@
 set -e -x
 
-GMP_VERSION=6.2.1
+GMP_VERSION=6.3.0
 MPFR_VERSION=4.2.1
-MPC_VERSION=1.2.1
+MPC_VERSION=1.3.1
 if [ ! -f finish_before_ci_build ]; then
   if [[ "$OSTYPE" == "linux-gnu" || "$OSTYPE" == "linux-musl" || "$OSTYPE" == "darwin"* ]]; then
     curl -s -O https://ftp.gnu.org/gnu/gmp/gmp-${GMP_VERSION}.tar.xz
     tar -xf gmp-${GMP_VERSION}.tar.xz
-    cd gmp-${GMP_VERSION}
-    patch -N -Z -p0 < ../scripts/patch-arm64.diff && cd ..
     cd gmp-${GMP_VERSION} && ./configure --enable-fat && make -j4 && make install && cd ../
     curl -s -O https://ftp.gnu.org/gnu/mpfr/mpfr-${MPFR_VERSION}.tar.gz
     tar -xf mpfr-${MPFR_VERSION}.tar.gz

diff --git a/scripts/before_ci_build_apple_silicon.sh b/scripts/before_ci_build_apple_silicon.sh
@@ -1,18 +1,15 @@
 set -e -x
 
-GMP_VERSION=6.2.1
+GMP_VERSION=6.3.0
 MPFR_VERSION=4.2.1
-MPC_VERSION=1.2.1
+MPC_VERSION=1.3.1
 export CPPFLAGS=" --target=arm64-apple-macos11"
 export LDFLAGS=" -arch arm64"
 EXTRA="--build=x86_64-apple-darwin --host=aarch64-apple-darwin --target=aarch64-apple-darwin"
 if [ ! -f finish_before_ci_build ]; then
   if [[ "$OSTYPE" == "linux-gnu" || "$OSTYPE" == "linux-musl" || "$OSTYPE" == "darwin"* ]]; then
     curl -O https://ftp.gnu.org/gnu/gmp/gmp-${GMP_VERSION}.tar.xz
     tar -xf gmp-${GMP_VERSION}.tar.xz
-    cd gmp-${GMP_VERSION}
-    patch -N -Z -p0 < ../scripts/patch-arm64.diff
-    cd ..
     # need to set host to the oldest triple to avoid building binaries
     # that use build machine micro-architecure. configfsf.guess is the one that
     # comes with autotools which is micro-architecture agnostic.