Merge pull request #19704 from JuliaLang/tk/depversions

Upgrade curl and gmp
JuliaLang · Dec 26, 2016 · d8a5718 · d8a5718 · nanosoldier · Dec 27, 2016
2 parents 4793e88 + 4dc9c83
commit d8a5718
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 36 deletions.
diff --git a/deps/Versions.make b/deps/Versions.make
@@ -7,8 +7,8 @@ FFTW_VER = 3.3.5
 SUITESPARSE_VER = 4.4.5
 UNWIND_VER = 1.1-julia2
 OSXUNWIND_VER = 0.0.3
-GMP_VER = 6.1.1
+GMP_VER = 6.1.2
 MPFR_VER = 3.1.5
 PATCHELF_VER = 0.9
 MBEDTLS_VER = 2.3.0
-CURL_VER = 7.51.0
+CURL_VER = 7.52.1
diff --git a/deps/checksums/curl-7.51.0.tar.bz2/md5 b/deps/checksums/curl-7.51.0.tar.bz2/md5
diff --git a/deps/checksums/curl-7.51.0.tar.bz2/sha512 b/deps/checksums/curl-7.51.0.tar.bz2/sha512
diff --git a/deps/checksums/curl-7.52.1.tar.bz2/md5 b/deps/checksums/curl-7.52.1.tar.bz2/md5
@@ -0,0 +1 @@
+dd014df06ff1d12e173de86873f9f77a
diff --git a/deps/checksums/curl-7.52.1.tar.bz2/sha512 b/deps/checksums/curl-7.52.1.tar.bz2/sha512
@@ -0,0 +1 @@
+cf36563c77d096f2c6084354ed6d45ccca7c557828ceab21204e4e8be0d4f0d287839c8cfac906174b86d51a1ee816c2769fc78ef88f039c9645bd2c27982a75
diff --git a/deps/checksums/gmp-6.1.1.tar.bz2/md5 b/deps/checksums/gmp-6.1.1.tar.bz2/md5
diff --git a/deps/checksums/gmp-6.1.1.tar.bz2/sha512 b/deps/checksums/gmp-6.1.1.tar.bz2/sha512
diff --git a/deps/checksums/gmp-6.1.2.tar.bz2/md5 b/deps/checksums/gmp-6.1.2.tar.bz2/md5
@@ -0,0 +1 @@
+8ddbb26dc3bd4e2302984debba1406a5
diff --git a/deps/checksums/gmp-6.1.2.tar.bz2/sha512 b/deps/checksums/gmp-6.1.2.tar.bz2/sha512
@@ -0,0 +1 @@
+268db88447174617f5746d9a6ba2b105940cc1a5e73155eb23b6eedf55f8e7724eda05d161b2de19aca9e794956d226ba9ed6f23124c7c82f7e1872e32b003cf
diff --git a/deps/curl.mk b/deps/curl.mk
@@ -19,11 +19,7 @@ $(SRCDIR)/srccache/curl-$(CURL_VER)/source-extracted: $(SRCDIR)/srccache/curl-$(
 	touch -c $(SRCDIR)/srccache/curl-$(CURL_VER)/configure # old target
 	echo 1 > $@
 
-$(SRCDIR)/srccache/curl-$(CURL_VER)/curl-mbedtls-includes.patch-applied: $(SRCDIR)/srccache/curl-$(CURL_VER)/source-extracted
-	cd $(SRCDIR)/srccache/curl-$(CURL_VER) && patch -p1 -f < $(SRCDIR)/patches/curl-mbedtls-includes.patch
-	echo 1 > $@
-
-$(BUILDDIR)/curl-$(CURL_VER)/build-configured: $(SRCDIR)/srccache/curl-$(CURL_VER)/source-extracted $(SRCDIR)/srccache/curl-$(CURL_VER)/curl-mbedtls-includes.patch-applied
+$(BUILDDIR)/curl-$(CURL_VER)/build-configured: $(SRCDIR)/srccache/curl-$(CURL_VER)/source-extracted
 	mkdir -p $(dir $@)
 	cd $(dir $@) && \
 	$(dir $<)/configure $(CONFIGURE_COMMON) --includedir=$(build_includedir) \

diff --git a/deps/patches/curl-mbedtls-includes.patch b/deps/patches/curl-mbedtls-includes.patch