update MPFR to v4.1.0 (#36776)

Includes build fixes to ensure it is built thread-safe. Fixes #35796 regression. (cherry picked from commit 193b21b)
JuliaLang · Aug 19, 2020 · 495caa2 · 495caa2
1 parent 9477413
commit 495caa2
Show file tree

Hide file tree

Showing 59 changed files with 39 additions and 33 deletions.
diff --git a/contrib/refresh_bb_tarballs.sh b/contrib/refresh_bb_tarballs.sh
@@ -35,6 +35,12 @@ fi
 # Get "contrib/" directory path
 CONTRIB_DIR=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
 
+# Get the source hash for each project
+for proj in ${BB_PROJECTS}; do
+ PROJ="$(echo ${proj} | tr [a-z] [A-Z])"
+ make -C "${CONTRIB_DIR}/../deps" USE_BINARYBUILDER_${PROJ}=0 DEPS_GIT=0 extract-${proj}
+done
+
 # For each triplet and each project, download the BB tarball and save its hash:
 for triplet in ${TRIPLETS}; do
  for proj in ${BB_PROJECTS}; do

diff --git a/deps/Versions.make b/deps/Versions.make
@@ -17,8 +17,9 @@ OSXUNWIND_VER = 0.0.5
 OSXUNWIND_BB_REL = 0
 GMP_VER = 6.1.2
 GMP_BB_REL = 4
-MPFR_VER = 4.0.2
 MPFR_BB_REL = 2
+MPFR_VER = 4.1.0
+MPFR_BB_REL = 1
 PATCHELF_VER = 0.9
 MBEDTLS_VER = 2.16.0
 MBEDTLS_BB_REL = 1

diff --git a/deps/checksums/MPFR.v4.0.2-2.aarch64-linux-gnu.tar.gz/md5 b/deps/checksums/MPFR.v4.0.2-2.aarch64-linux-gnu.tar.gz/md5
diff --git a/deps/checksums/MPFR.v4.0.2-2.aarch64-linux-gnu.tar.gz/sha512 b/deps/checksums/MPFR.v4.0.2-2.aarch64-linux-gnu.tar.gz/sha512
diff --git a/deps/checksums/MPFR.v4.0.2-2.aarch64-linux-musl.tar.gz/md5 b/deps/checksums/MPFR.v4.0.2-2.aarch64-linux-musl.tar.gz/md5
diff --git a/deps/checksums/MPFR.v4.0.2-2.aarch64-linux-musl.tar.gz/sha512 b/deps/checksums/MPFR.v4.0.2-2.aarch64-linux-musl.tar.gz/sha512
diff --git a/deps/checksums/MPFR.v4.0.2-2.armv7l-linux-gnueabihf.tar.gz/md5 b/deps/checksums/MPFR.v4.0.2-2.armv7l-linux-gnueabihf.tar.gz/md5
diff --git a/deps/checksums/MPFR.v4.0.2-2.armv7l-linux-gnueabihf.tar.gz/sha512 b/deps/checksums/MPFR.v4.0.2-2.armv7l-linux-gnueabihf.tar.gz/sha512
diff --git a/deps/checksums/MPFR.v4.0.2-2.armv7l-linux-musleabihf.tar.gz/md5 b/deps/checksums/MPFR.v4.0.2-2.armv7l-linux-musleabihf.tar.gz/md5
diff --git a/deps/checksums/MPFR.v4.0.2-2.armv7l-linux-musleabihf.tar.gz/sha512 b/deps/checksums/MPFR.v4.0.2-2.armv7l-linux-musleabihf.tar.gz/sha512
diff --git a/deps/checksums/MPFR.v4.0.2-2.i686-linux-gnu.tar.gz/md5 b/deps/checksums/MPFR.v4.0.2-2.i686-linux-gnu.tar.gz/md5
diff --git a/deps/checksums/MPFR.v4.0.2-2.i686-linux-gnu.tar.gz/sha512 b/deps/checksums/MPFR.v4.0.2-2.i686-linux-gnu.tar.gz/sha512
diff --git a/deps/checksums/MPFR.v4.0.2-2.i686-linux-musl.tar.gz/md5 b/deps/checksums/MPFR.v4.0.2-2.i686-linux-musl.tar.gz/md5
diff --git a/deps/checksums/MPFR.v4.0.2-2.i686-linux-musl.tar.gz/sha512 b/deps/checksums/MPFR.v4.0.2-2.i686-linux-musl.tar.gz/sha512
diff --git a/deps/checksums/MPFR.v4.0.2-2.i686-w64-mingw32.tar.gz/md5 b/deps/checksums/MPFR.v4.0.2-2.i686-w64-mingw32.tar.gz/md5
diff --git a/deps/checksums/MPFR.v4.0.2-2.i686-w64-mingw32.tar.gz/sha512 b/deps/checksums/MPFR.v4.0.2-2.i686-w64-mingw32.tar.gz/sha512
diff --git a/deps/checksums/MPFR.v4.0.2-2.powerpc64le-linux-gnu.tar.gz/md5 b/deps/checksums/MPFR.v4.0.2-2.powerpc64le-linux-gnu.tar.gz/md5
diff --git a/deps/checksums/MPFR.v4.0.2-2.powerpc64le-linux-gnu.tar.gz/sha512 b/deps/checksums/MPFR.v4.0.2-2.powerpc64le-linux-gnu.tar.gz/sha512
diff --git a/deps/checksums/MPFR.v4.0.2-2.x86_64-apple-darwin14.tar.gz/md5 b/deps/checksums/MPFR.v4.0.2-2.x86_64-apple-darwin14.tar.gz/md5
diff --git a/deps/checksums/MPFR.v4.0.2-2.x86_64-apple-darwin14.tar.gz/sha512 b/deps/checksums/MPFR.v4.0.2-2.x86_64-apple-darwin14.tar.gz/sha512
diff --git a/deps/checksums/MPFR.v4.0.2-2.x86_64-linux-gnu.tar.gz/md5 b/deps/checksums/MPFR.v4.0.2-2.x86_64-linux-gnu.tar.gz/md5
diff --git a/deps/checksums/MPFR.v4.0.2-2.x86_64-linux-gnu.tar.gz/sha512 b/deps/checksums/MPFR.v4.0.2-2.x86_64-linux-gnu.tar.gz/sha512
diff --git a/deps/checksums/MPFR.v4.0.2-2.x86_64-linux-musl.tar.gz/md5 b/deps/checksums/MPFR.v4.0.2-2.x86_64-linux-musl.tar.gz/md5
diff --git a/deps/checksums/MPFR.v4.0.2-2.x86_64-linux-musl.tar.gz/sha512 b/deps/checksums/MPFR.v4.0.2-2.x86_64-linux-musl.tar.gz/sha512
diff --git a/deps/checksums/MPFR.v4.0.2-2.x86_64-unknown-freebsd11.1.tar.gz/md5 b/deps/checksums/MPFR.v4.0.2-2.x86_64-unknown-freebsd11.1.tar.gz/md5
diff --git a/deps/checksums/MPFR.v4.0.2-2.x86_64-unknown-freebsd11.1.tar.gz/sha512 b/deps/checksums/MPFR.v4.0.2-2.x86_64-unknown-freebsd11.1.tar.gz/sha512
diff --git a/deps/checksums/MPFR.v4.0.2-2.x86_64-w64-mingw32.tar.gz/md5 b/deps/checksums/MPFR.v4.0.2-2.x86_64-w64-mingw32.tar.gz/md5
diff --git a/deps/checksums/MPFR.v4.0.2-2.x86_64-w64-mingw32.tar.gz/sha512 b/deps/checksums/MPFR.v4.0.2-2.x86_64-w64-mingw32.tar.gz/sha512
diff --git a/deps/checksums/MPFR.v4.1.0-1.aarch64-linux-gnu.tar.gz/md5 b/deps/checksums/MPFR.v4.1.0-1.aarch64-linux-gnu.tar.gz/md5
@@ -0,0 +1 @@
+480455278ac8186c988be4fd13ab08ed
diff --git a/deps/checksums/MPFR.v4.1.0-1.aarch64-linux-gnu.tar.gz/sha512 b/deps/checksums/MPFR.v4.1.0-1.aarch64-linux-gnu.tar.gz/sha512
@@ -0,0 +1 @@
+6dd5bd83b8ae7d839201760e245787c5c3caf19c209b0098bcd786e67186529c8fb2901c507aaae3fe26d01863b1ded8b30aa547312a238c4de68f64f90cd550
diff --git a/deps/checksums/MPFR.v4.1.0-1.aarch64-linux-musl.tar.gz/md5 b/deps/checksums/MPFR.v4.1.0-1.aarch64-linux-musl.tar.gz/md5
@@ -0,0 +1 @@
+5bd187d72846c25104009678d761e6b5
diff --git a/deps/checksums/MPFR.v4.1.0-1.aarch64-linux-musl.tar.gz/sha512 b/deps/checksums/MPFR.v4.1.0-1.aarch64-linux-musl.tar.gz/sha512
@@ -0,0 +1 @@
+86482e272578c72c3007d31103fd50ec449e2f92929f5ed991b947dd847e45f4362519e04c5407bae1845839c6aa11c6a5a817c5ef1418fa4ba67a03e395bf96
diff --git a/deps/checksums/MPFR.v4.1.0-1.armv7l-linux-gnueabihf.tar.gz/md5 b/deps/checksums/MPFR.v4.1.0-1.armv7l-linux-gnueabihf.tar.gz/md5
@@ -0,0 +1 @@
+9ee1860a6ab8e30d24e788d50e43d847
diff --git a/deps/checksums/MPFR.v4.1.0-1.armv7l-linux-gnueabihf.tar.gz/sha512 b/deps/checksums/MPFR.v4.1.0-1.armv7l-linux-gnueabihf.tar.gz/sha512
@@ -0,0 +1 @@
+37fc21794e9afe69c0a1e7efcc550f511e7bc41e446df66ff9e9497a7ee81b9e4a72eac31b02305f0f22722ae15224897fad85abb7f03fa5cbb2b78d83fa1523
diff --git a/deps/checksums/MPFR.v4.1.0-1.armv7l-linux-musleabihf.tar.gz/md5 b/deps/checksums/MPFR.v4.1.0-1.armv7l-linux-musleabihf.tar.gz/md5
@@ -0,0 +1 @@
+8478d8f44b7765f0efebfe816613fc77
diff --git a/deps/checksums/MPFR.v4.1.0-1.armv7l-linux-musleabihf.tar.gz/sha512 b/deps/checksums/MPFR.v4.1.0-1.armv7l-linux-musleabihf.tar.gz/sha512
@@ -0,0 +1 @@
+9681a299a4b71c723b5b1c48bfad7b0586f636e83c662233d142db426c146c4e228191480c6a626b030423fbe34e8a32338b3f0bb8c50dbe9f74ad0a0a57d6fd
diff --git a/deps/checksums/MPFR.v4.1.0-1.i686-linux-gnu.tar.gz/md5 b/deps/checksums/MPFR.v4.1.0-1.i686-linux-gnu.tar.gz/md5
@@ -0,0 +1 @@
+66d7d381aa1b706777bfca2f127384d6
diff --git a/deps/checksums/MPFR.v4.1.0-1.i686-linux-gnu.tar.gz/sha512 b/deps/checksums/MPFR.v4.1.0-1.i686-linux-gnu.tar.gz/sha512
@@ -0,0 +1 @@
+c0d2d4c9be047739ccbf5417dd85b3407eb86bf56a9a7ca33ab62b4f3976037f9bfd079bb758054623c40ce405d98dc3db44a1619353da9c71e91dc0bc281c6e
diff --git a/deps/checksums/MPFR.v4.1.0-1.i686-linux-musl.tar.gz/md5 b/deps/checksums/MPFR.v4.1.0-1.i686-linux-musl.tar.gz/md5
@@ -0,0 +1 @@
+5588d1db9f15911d9c329d35d982edc1
diff --git a/deps/checksums/MPFR.v4.1.0-1.i686-linux-musl.tar.gz/sha512 b/deps/checksums/MPFR.v4.1.0-1.i686-linux-musl.tar.gz/sha512
@@ -0,0 +1 @@
+27f3cdadf1ffc91dd4f6d95e970d342f48194251b8d0e7729af413e6cd5e57169cc755460e1a05ded6a2fde44b55fe41d55125d6dfe8aaf2a2df944e396b26fe
diff --git a/deps/checksums/MPFR.v4.1.0-1.i686-w64-mingw32.tar.gz/md5 b/deps/checksums/MPFR.v4.1.0-1.i686-w64-mingw32.tar.gz/md5
@@ -0,0 +1 @@
+5dd7e3fe4ad870901175acada852d155
diff --git a/deps/checksums/MPFR.v4.1.0-1.i686-w64-mingw32.tar.gz/sha512 b/deps/checksums/MPFR.v4.1.0-1.i686-w64-mingw32.tar.gz/sha512
@@ -0,0 +1 @@
+0d11f6f85ccefbfacf2df83fe7de10db31ca0420c2c2a8be9879b903b46c5339a988ead03b7ec76010a4f7d0f1c00f97ebeb40afc5e5ed663fec80bf8849d9a5
diff --git a/deps/checksums/MPFR.v4.1.0-1.powerpc64le-linux-gnu.tar.gz/md5 b/deps/checksums/MPFR.v4.1.0-1.powerpc64le-linux-gnu.tar.gz/md5
@@ -0,0 +1 @@
+be9158b8c2b8959a48f2894ee46c0a05
diff --git a/deps/checksums/MPFR.v4.1.0-1.powerpc64le-linux-gnu.tar.gz/sha512 b/deps/checksums/MPFR.v4.1.0-1.powerpc64le-linux-gnu.tar.gz/sha512
@@ -0,0 +1 @@
+aeb2d9475ef5e87609b4f9a8b5b60735268af7757162ad405a02955c6eb501f69024f4748d76355c11b9585191a8d3441b1c26e6c4d3bf0967453237292226ff
diff --git a/deps/checksums/MPFR.v4.1.0-1.x86_64-apple-darwin14.tar.gz/md5 b/deps/checksums/MPFR.v4.1.0-1.x86_64-apple-darwin14.tar.gz/md5
@@ -0,0 +1 @@
+d5bca8dd3d1d5b928fb280a2e69ec459
diff --git a/deps/checksums/MPFR.v4.1.0-1.x86_64-apple-darwin14.tar.gz/sha512 b/deps/checksums/MPFR.v4.1.0-1.x86_64-apple-darwin14.tar.gz/sha512
@@ -0,0 +1 @@
+2a4035ccac6c30319d0b767748f332ae2748189a26e0d7cb61081a177819f08a5627e6de81dce6cb22fe5a1c34250d91b300befbf013a23dfeeb4579e628e383
diff --git a/deps/checksums/MPFR.v4.1.0-1.x86_64-linux-gnu.tar.gz/md5 b/deps/checksums/MPFR.v4.1.0-1.x86_64-linux-gnu.tar.gz/md5
@@ -0,0 +1 @@
+6b00c09e1a54db66c215bf591c36ea67
diff --git a/deps/checksums/MPFR.v4.1.0-1.x86_64-linux-gnu.tar.gz/sha512 b/deps/checksums/MPFR.v4.1.0-1.x86_64-linux-gnu.tar.gz/sha512
@@ -0,0 +1 @@
+e9f00f761cb146ef314b0ed60df6d95a203e7cfbe4678fe3b54c3bf592e9ddaba79c406dd9e1f369ddb2d3f8d42ee37dd6e891b73b973300b470a3bb97425a22
diff --git a/deps/checksums/MPFR.v4.1.0-1.x86_64-linux-musl.tar.gz/md5 b/deps/checksums/MPFR.v4.1.0-1.x86_64-linux-musl.tar.gz/md5
@@ -0,0 +1 @@
+a359b259f20accd58f6056dae52ddf38
diff --git a/deps/checksums/MPFR.v4.1.0-1.x86_64-linux-musl.tar.gz/sha512 b/deps/checksums/MPFR.v4.1.0-1.x86_64-linux-musl.tar.gz/sha512
@@ -0,0 +1 @@
+7e0e14fd0bd66c600e862c4e053eb12ba7b69f526cdd9a6e0a1a91de6e54d51b86ed9b6c38badec81e43485f97dbc8be3c9ae3d5431b5c8a671d295ff8fea3b6
diff --git a/deps/checksums/MPFR.v4.1.0-1.x86_64-unknown-freebsd11.1.tar.gz/md5 b/deps/checksums/MPFR.v4.1.0-1.x86_64-unknown-freebsd11.1.tar.gz/md5
@@ -0,0 +1 @@
+3fb5ea2f380e675cc951853016cb5fe3
diff --git a/deps/checksums/MPFR.v4.1.0-1.x86_64-unknown-freebsd11.1.tar.gz/sha512 b/deps/checksums/MPFR.v4.1.0-1.x86_64-unknown-freebsd11.1.tar.gz/sha512
@@ -0,0 +1 @@
+4a9666c2d5e6357ad4ca8a4913097f76090925bf0319705065d37f8115fdc5cd8feffdb36a6f9a0400af6c551531b57708a834b73ed508ca1dde1897154382ca
diff --git a/deps/checksums/MPFR.v4.1.0-1.x86_64-w64-mingw32.tar.gz/md5 b/deps/checksums/MPFR.v4.1.0-1.x86_64-w64-mingw32.tar.gz/md5
@@ -0,0 +1 @@
+653bbd918e4a340ace302d20ce096e35
diff --git a/deps/checksums/MPFR.v4.1.0-1.x86_64-w64-mingw32.tar.gz/sha512 b/deps/checksums/MPFR.v4.1.0-1.x86_64-w64-mingw32.tar.gz/sha512
@@ -0,0 +1 @@
+77a91ba9c41049fb9511248344bac4ab9fbb1feb965dd0e78b09ce07c2d4d7df60c74528e4d1966e1a7000587b7766c904070fa3da9746e9341033f54df8b9c6
diff --git a/deps/checksums/mpfr-4.0.2.tar.bz2/md5 b/deps/checksums/mpfr-4.0.2.tar.bz2/md5
diff --git a/deps/checksums/mpfr-4.0.2.tar.bz2/sha512 b/deps/checksums/mpfr-4.0.2.tar.bz2/sha512
diff --git a/deps/checksums/mpfr-4.1.0.tar.bz2/md5 b/deps/checksums/mpfr-4.1.0.tar.bz2/md5
@@ -0,0 +1 @@
+44b892bc5a45bafb4294d134e13aad1d
diff --git a/deps/checksums/mpfr-4.1.0.tar.bz2/sha512 b/deps/checksums/mpfr-4.1.0.tar.bz2/sha512
@@ -0,0 +1 @@
+410208ee0d48474c1c10d3d4a59decd2dfa187064183b09358ec4c4666e34d74383128436b404123b831e585d81a9176b24c7ced9d913967c5fce35d4040a0b4
diff --git a/deps/mpfr.mk b/deps/mpfr.mk
@@ -6,14 +6,13 @@ endif
 
 ifneq ($(USE_BINARYBUILDER_MPFR),1)
 
-ifeq ($(USE_SYSTEM_MPFR), 0)
+MPFR_OPTS := --enable-thread-safe --enable-shared-cache --disable-float128 --disable-decimal-float
 ifeq ($(USE_SYSTEM_GMP), 0)
-MPFR_OPTS := --with-gmp-include=$(abspath $(build_includedir)) --with-gmp-lib=$(abspath $(build_shlibdir))
-endif
+MPFR_OPTS += --with-gmp-include=$(abspath $(build_includedir)) --with-gmp-lib=$(abspath $(build_shlibdir))
 endif
 ifeq ($(BUILD_OS),WINNT)
 ifeq ($(OS),WINNT)
-MPFR_OPTS += --disable-thread-safe CFLAGS="$(CFLAGS) -DNPRINTF_L -DNPRINTF_T -DNPRINTF_J"
+MPFR_OPTS += CFLAGS="$(CFLAGS) -DNPRINTF_L -DNPRINTF_T -DNPRINTF_J"
 endif
 endif