Merge pull request JuliaLang#13971 from JuliaLang/tk/bump-gmp-libgit2

Bump GMP to 6.1.0 and libgit2 to 0.23.4
jiahao · Nov 14, 2015 · 1ee33a6 · 1ee33a6
2 parents e17b4bd + 14933bc
commit 1ee33a6
Show file tree

Hide file tree

Showing 12 changed files with 7 additions and 31 deletions.
diff --git a/deps/Makefile b/deps/Makefile
@@ -1790,7 +1790,6 @@ $(SRCDIR)/srccache/gmp-$(GMP_VER)/configure: $(SRCDIR)/srccache/gmp-$(GMP_VER).t
  cd $(dir $<) && $(TAR) jxf $<
  touch -c $@
 $(SRCDIR)/srccache/gmp-$(GMP_VER)/patched: $(SRCDIR)/srccache/gmp-$(GMP_VER)/configure
- cd $(dir $@) && patch -p1 < $(SRCDIR)/gmp_6.0.0_osx.patch
  echo 1 > $@
 $(BUILDDIR)/gmp-$(GMP_VER)/config.status: $(SRCDIR)/srccache/gmp-$(GMP_VER)/configure $(SRCDIR)/srccache/gmp-$(GMP_VER)/patched
  mkdir -p $(dir $@)
@@ -2024,8 +2023,6 @@ else
 LIBGIT2_OPTS += -DBUILD_CLAR=OFF -DCMAKE_RC_COMPILER=`which $(CROSS_COMPILE)windres` -DDLLTOOL=`which $(CROSS_COMPILE)dlltool`
 LIBGIT2_OPTS += -DCMAKE_FIND_ROOT_PATH=/usr/$(XC_HOST) -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=ONLY
 endif
-else ifneq ($(OS), Darwin)
-LIBGIT2_OPTS += -DREQUIRE_OPENSSL=ON
 endif
 
 $(BUILDDIR)/$(LIBGIT2_SRC_DIR)/Makefile: $(SRCDIR)/srccache/$(LIBGIT2_SRC_DIR)/CMakeLists.txt

diff --git a/deps/Versions.make b/deps/Versions.make
@@ -8,7 +8,7 @@ FFTW_VER = 3.3.4
 SUITESPARSE_VER = 4.4.5
 UNWIND_VER = 1.1
 OSXUNWIND_VER = 0.0.3
-GMP_VER = 6.0.0
+GMP_VER = 6.1.0
 MPFR_VER = 3.1.3
 PATCHELF_VER = 0.8
 GIT_VER = 1.8.5.6

diff --git a/deps/checksums/gmp-6.0.0.tar.bz2/md5 b/deps/checksums/gmp-6.0.0.tar.bz2/md5
diff --git a/deps/checksums/gmp-6.0.0.tar.bz2/sha512 b/deps/checksums/gmp-6.0.0.tar.bz2/sha512
diff --git a/deps/checksums/gmp-6.1.0.tar.bz2/md5 b/deps/checksums/gmp-6.1.0.tar.bz2/md5
@@ -0,0 +1 @@
+86ee6e54ebfc4a90b643a65e402c4048
diff --git a/deps/checksums/gmp-6.1.0.tar.bz2/sha512 b/deps/checksums/gmp-6.1.0.tar.bz2/sha512
@@ -0,0 +1 @@
+3c82aeab9c1596d4da8afac2eec38e429e84f3211e1a572cf8fd2b546493c44c039b922a1133eaaa48bd7f3e11dbe795a384e21ed95cbe3ecc58d7ac02246117
diff --git a/deps/checksums/libgit2-2de198b4cec26c2b54c06da4baf88b3f57b9ca86.tar.gz/md5 b/deps/checksums/libgit2-2de198b4cec26c2b54c06da4baf88b3f57b9ca86.tar.gz/md5
diff --git a/deps/checksums/libgit2-2de198b4cec26c2b54c06da4baf88b3f57b9ca86.tar.gz/sha512 b/deps/checksums/libgit2-2de198b4cec26c2b54c06da4baf88b3f57b9ca86.tar.gz/sha512
diff --git a/deps/checksums/libgit2-e8feafe32007ebd16a61820c70abd221655d053c.tar.gz/md5 b/deps/checksums/libgit2-e8feafe32007ebd16a61820c70abd221655d053c.tar.gz/md5
@@ -0,0 +1 @@
+417d9be015cda7fcd25e873b4c8fa648
diff --git a/deps/checksums/libgit2-e8feafe32007ebd16a61820c70abd221655d053c.tar.gz/sha512 b/deps/checksums/libgit2-e8feafe32007ebd16a61820c70abd221655d053c.tar.gz/sha512
@@ -0,0 +1 @@
+987f0649a85fd79bf06db6aca9829eacbbbeac6cedd283c84e385ecc41eab86a47d14b80ec1edda133202a4a7f22ee56a9ac1e80b00d1ad78cabce7066b32c0b
diff --git a/deps/gmp_6.0.0_osx.patch b/deps/gmp_6.0.0_osx.patch
diff --git a/deps/libgit2.version b/deps/libgit2.version
@@ -1,2 +1,2 @@
-LIBGIT2_BRANCH=v0.23.2
-LIBGIT2_SHA1=2de198b4cec26c2b54c06da4baf88b3f57b9ca86
+LIBGIT2_BRANCH=v0.23.4
+LIBGIT2_SHA1=e8feafe32007ebd16a61820c70abd221655d053c