Skip to content

Commit

Permalink
Update to GMP 6.2.0
Browse files Browse the repository at this point in the history
This fixes a few bugs and brings performance improvements; for the full
release notes, see <https://gmplib.org/gmp6.2>.

Removed `deps/patches/gmp-config-ldflags.patch` as it is no longer needed.

Adjusted `deps/patches/gmp-exception.patch` (in principle it could go, but
then on Windows division by zero of GMP integers would not lead to a
`DivideError` but instead a generic `ErrorException`)
  • Loading branch information
fingolfin committed Jun 22, 2020
1 parent f6d34c3 commit 9d5484e
Show file tree
Hide file tree
Showing 83 changed files with 69 additions and 452 deletions.
4 changes: 2 additions & 2 deletions contrib/refresh_bb_tarballs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
TRIPLETS="i686-linux-gnu x86_64-linux-gnu aarch64-linux-gnu armv7l-linux-gnueabihf powerpc64le-linux-gnu i686-linux-musl x86_64-linux-musl aarch64-linux-musl armv7l-linux-musleabihf x86_64-apple-darwin14 x86_64-unknown-freebsd11.1 i686-w64-mingw32 x86_64-w64-mingw32"

# These are the projects currently using BinaryBuilder; both GCC-expanded and non-GCC-expanded:
BB_PROJECTS="gmp mbedtls libssh2 mpfr curl libgit2 pcre libuv unwind osxunwind dsfmt objconv p7zip zlib suitesparse openlibm"
BB_PROJECTS="mbedtls libssh2 mpfr curl libgit2 pcre libuv unwind osxunwind dsfmt objconv p7zip zlib suitesparse openlibm"
BB_GCC_EXPANDED_PROJECTS="openblas"
BB_CXX_EXPANDED_PROJECTS="llvm"
BB_CXX_EXPANDED_PROJECTS="gmp llvm"

# If we've been given a project name, filter down to that one:
if [ -n "${1}" ]; then
Expand Down
4 changes: 2 additions & 2 deletions deps/Versions.make
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ UNWIND_VER = 1.3.1
UNWIND_BB_REL = 4
OSXUNWIND_VER = 0.0.5
OSXUNWIND_BB_REL = 0
GMP_VER = 6.1.2
GMP_BB_REL = 4
GMP_VER = 6.2.0
GMP_BB_REL = 0
MPFR_VER = 4.0.2
MPFR_BB_REL = 2
PATCHELF_VER = 0.9
Expand Down
1 change: 0 additions & 1 deletion deps/checksums/GMP.v6.1.2-4.aarch64-linux-gnu.tar.gz/md5

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/GMP.v6.1.2-4.aarch64-linux-musl.tar.gz/md5

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/GMP.v6.1.2-4.i686-linux-gnu.tar.gz/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/GMP.v6.1.2-4.i686-linux-gnu.tar.gz/sha512

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/GMP.v6.1.2-4.i686-linux-musl.tar.gz/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/GMP.v6.1.2-4.i686-linux-musl.tar.gz/sha512

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/GMP.v6.1.2-4.i686-w64-mingw32.tar.gz/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/GMP.v6.1.2-4.i686-w64-mingw32.tar.gz/sha512

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/GMP.v6.1.2-4.x86_64-linux-gnu.tar.gz/md5

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/GMP.v6.1.2-4.x86_64-linux-gnu.tar.gz/sha512

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/GMP.v6.1.2-4.x86_64-linux-musl.tar.gz/md5

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion deps/checksums/GMP.v6.1.2-4.x86_64-w64-mingw32.tar.gz/md5

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
20672d3ba36a77d359172cc095f78805
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
b2f456fa97f4a68b512c286e89b5cc599f77f7e84956d761a93e6365f3ca425624e1c675f7c8c3132746d2ffcbc785537144401fca8f744869c606a579654512
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
460394e5250cc11ba294645d2f1ffeac
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6691625b2941ee9ef8fcdcbccd53e161a45cb37cbb3b87e4f40f2ae919189e2b7dcf5c10ffbd271be7d9f9bf60fb4a05e9532e965cac66ccd57836c364e288a2
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dc00a630947a489351d67903f5c12aae
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8434a751bb6c0e610dda33e37a09a78331f41376df7362192e215d3c328c6730bb138fe8fd773dd907a6bb3b31b5e408eaf0a706f858c6a498b69db0315925c6
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d36cbb7473f9ce430df233b82b4c14f4
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8fcda8c37131f0b44682548eaa4420fe74819fd9ab2ac6448464947c1f4b8328a5856ccd2ef3b8a400dc5e5d861d332354370ce36127bbea9eb6569705095b5b
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f540d3dbe282d10469a6358b55d28939
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
04a66ec0d96bc3ed35fcaa0830a1592068677b71f0c7c1e1d34e8fa5626f17ee202562510d36ccda1ccc710d85fa1799bbf795d4cd46841e160e2a7920403310
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e11d981d3fbcdc0dec57d9e6683096c0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ddf3d98681ba2d0d886dc0c26a7d916e34ec16e3f1ef75ebdc3ec87a984ea874076af0d20220d85185de0e878f0819d8bb1a7f1ddb1a5f3b53362552f104e5e8
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2d8041c9fdafc830a89a5cc2a2864283
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
e366bb276ae4c6ad03ddacfb74c78793826e200465c7abcf8e158d05b16794e296ba8abe1780fbb586e0cadf28ed267ac981a408fb9dc3231547d30310962d29
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1cb79462479e95afb33de29b26c9c60f
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
56b1b8adbb9b660a19b10095c489fa67787c5a383fc409062c76afe659684ee44e31086ed683d3e058621302f69dd6547186901950ad2a57dc52c3f11df85e1d
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
98dbed7361d07bbcbace591767a394b0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
26a3ad2641b51fe8aa4b18383adc35a2093abae4f8bd483bf730428159f79d8a155e180ac1b71fe77a558d3071e3cf6701c45b2b54c6bdce9710c9dd8ae6ee05
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f4311e1c856d88ef56b2e1a317486b0a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
80a61943871a1c78c9483acd96e5821a2e0a684a6fca9283639abd29a6c523dc5f191dbd8001e8c45501c99d2ee6a2a1aa34293e5ee15670481f2e64f8cd8001
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7de233cd7941bd4d4fe463cb390b9b76
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3005c252e9fa3f42fa1eb7a42b6e239630df2cbb9641e278b1fe0e24c0aafaf086eade41c1a68660b0e60cc3a9eb61883835df265373e5476e90f701b452d042
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bbbc8ac72aba716263c39cf621cd7028
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7ce94e3a5ac55ed27ed380c17931f51a5f6eeba9b06c7d23396fa27a1e198839fbd6dfc1f90374e2c8434608e160adff758da85d4e6560a56b3ae1bed39e832e
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
56a84b9057036f41d69847e8f4127fea
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d1cfdec4d462eddf3969a6c3b581c73cd90d70adf2afd07e1fa7bfce04a32630305e7eec22ff465e9ecedc0b12a337f0820f4f91e92f76ec9e161e9d0749ebca
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
23c5bf724a267de767ac633c94aedd79
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4e00c86635c09576200def2de7e4f5c6697a98cfce134c617f4c21dd7874a0a22665908f3530801a854b2867955885bf51cfbffd8f370be733c219448e212e6c
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3046fbc73ae52f4105c7083f9fe62c4a
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9f6c01bedfe38c332255e8a4a2c4e03390db081c963f82ba9ad50117c5c5f810f387d5247466769d22c19bce8e2914305d0cb5f3d5214c6315aa764665e57e00
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8d337e5b138241591cb2d1baec2485db
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2ff8a58d78a80cf1f9629dccedece0e4bdf4af4a3a5b56dcb2664cf42c849764760ee823a62f2722d54405ff49a0f222af1c5ccf50cc3dd34ccbafdee2bc44be
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
d4e319df84721a019b033e538e0bbd97
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
791ddf702c8751d7756fe2dc1ef3aa0d67fa5b4773064cc3e3012447f9b09516108dfa86b9b9326f19045bcd1807377b920efc2de6e90250f42a08d9ae4e99cb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2eb46789ca2af60a9fae1a0b92bec9c3
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
8ce0f8c6a43f748885d3b044792e995c1729fb3576db52b136de5f8a1054b3d83d9c33ad38e907bf442d40b13b6eb5d2f539058d8a642d85405e2cccc09137e2
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
bd4b77b4ad10d932352b93cc79583963
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ae87d70aaeae01027cdb1f4fe76ee44abf8a68361f2086ecb93cfc54b7974a749508dc1ea60d7bb1806bdb1f0d58296d66d731c33d6f98a93bc6254374162de8
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
42a7bfaa427ad3bd20df3b94652ee16b
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0fdd19cb13a81efec2b5c36287f97659000c0bc2a812e11cfa2053cbb42aa7aeeb5558ea531a6f2c8378467f03073fe87b33898230197bdfd1c5b168e2f87c41
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fdf152c6473d303c58624497984547d5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
f68204bbadece63ed2980ef1d51567fbaa9689f2c6b68306636eaf44fa80001748cfacf41a16c16cd441acc049a139436964cd9f56220832f4789b14edc5a815
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
959a97e62c016409a722f35e92940109
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
6364c770cdf039c52a27f946ec0cf4229d0a3ef90c7c4beb9c8ccd0f915787436be11c340106742dd223cc50bf1f98a7cb228fee10bda151d166c646f326e14c
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
484d6a7beed5248b8611f458cbfc311f
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
368bb6415b913fc4494fffc7bedb1ac48fd8d5c3ca697f790b59c1f8edce1780877b91acb20c627426de5bc024a9a3238b25d57150e2b483e1bc3d19da2c5460
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
83db3a1e6d1faeffaf241faf906d6659
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4e3afafda2355463f3c301a112b23ddebeb5018e6b1271339ecc9a2e76297215c25228f6eb08a34a3fd8be93378040b1172457c714bec1af702b803baa92937d
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
96a5f00e789fc2fb31b42f67a44ff3b0
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9b3982200a1e034964908b019e288dcc8b192524d5ecfc23bf9e3e367dd5ef3b57d6c0aec8bf3ef6e365e5ecee15d4590634342e681c1896c0e992b7edcc6607
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1ec5c4395753cae4c741abcfb1be7a11
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
486ddc1d1e5ca320a2cfc329486ebf7e5ebb5cfb3388cab2ce0221ed615634dcaafd003bfa53191e510f790d3854afc26e7a45dc7d35610ed467d34126b19f9b
11 changes: 2 additions & 9 deletions deps/gmp.mk
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,10 @@ $(SRCCACHE)/gmp-$(GMP_VER)/source-extracted: $(SRCCACHE)/gmp-$(GMP_VER).tar.bz2
echo 1 > $@

$(SRCCACHE)/gmp-$(GMP_VER)/build-patched: $(SRCCACHE)/gmp-$(GMP_VER)/source-extracted
cp $(SRCDIR)/patches/config.sub $(SRCCACHE)/gmp-$(GMP_VER)/configfsf.sub
cd $(dir $@) && patch < $(SRCDIR)/patches/gmp-exception.patch
cd $(dir $@) && patch -p1 < $(SRCDIR)/patches/gmp-exception.patch
cd $(dir $@) && patch -p1 < $(SRCDIR)/patches/gmp_alloc_overflow_func.patch
echo 1 > $@

$(SRCCACHE)/gmp-$(GMP_VER)/gmp-config-ldflags.patch-applied: | $(SRCCACHE)/gmp-$(GMP_VER)/build-patched
cd $(dir $@) && patch -p1 < $(SRCDIR)/patches/gmp-config-ldflags.patch
echo 1 > $@

$(BUILDDIR)/gmp-$(GMP_VER)/build-configured: $(SRCCACHE)/gmp-$(GMP_VER)/gmp-config-ldflags.patch-applied

$(BUILDDIR)/gmp-$(GMP_VER)/build-configured: $(SRCCACHE)/gmp-$(GMP_VER)/source-extracted
mkdir -p $(dir $@)
cd $(dir $@) && \
Expand Down Expand Up @@ -81,5 +74,5 @@ else # USE_BINARYBUILDER_GMP
GMP_BB_URL_BASE := https://github.com/JuliaBinaryWrappers/GMP_jll.jl/releases/download/GMP-v$(GMP_VER)+$(GMP_BB_REL)
GMP_BB_NAME := GMP.v$(GMP_VER)

$(eval $(call bb-install,gmp,GMP,false))
$(eval $(call bb-install,gmp,GMP,false,true))
endif
Loading

0 comments on commit 9d5484e

Please sign in to comment.