deps: merge all libname.version into Versions.make

inkydragon · Jun 15, 2022 · 25bdfde · 25bdfde
1 parent 9581434
commit 25bdfde
Show file tree

Hide file tree

Showing 11 changed files with 31 additions and 27 deletions.
diff --git a/deps/Versions.make b/deps/Versions.make
@@ -34,19 +34,31 @@ LAPACK_VER := 3.9.0
 
 # LibGit2
 LIBGIT2_JLL_NAME := LibGit2
+LIBGIT2_BRANCH = v1.3.0
+LIBGIT2_SHA1 = b7bad55e4bb0a285b073ba5e02b01d3f522fc95d
 
 # LibSSH2
-LIBSSH2_VER := 1.10.2
 LIBSSH2_JLL_NAME := LibSSH2
+LIBSSH2_VER := 1.10.2
+LIBSSH2_BRANCH = libssh2-1.10.0
+LIBSSH2_SHA1 = 635caa90787220ac3773c1d5ba11f1236c22eae8
 
 # LibUV
-LIBUV_VER := 2
 LIBUV_JLL_NAME := LibUV
+LIBUV_VER := 2
+LIBUV_BRANCH = julia-uv2-1.44.1
+LIBUV_SHA1 = 1b2d16477fe1142adea952168d828a066e03ee4c
+
+# LibWhich
+LIBWHICH_BRANCH = master
+LIBWHICH_SHA1 = 81e9723c0273d78493dc8c8ed570f68d9ce7e89e
 
 # LLVM
+LLVM_JLL_NAME := libLLVM
 LLVM_VER := 13.0.1
 LLVM_ASSERT_JLL_VER := 13.0.1+0
-LLVM_JLL_NAME := libLLVM
+LLVM_BRANCH = julia-13.0.1-0
+LLVM_SHA1 = julia-13.0.1-0
 
 # LLVM_tools (downloads LLVM_jll to get things like `lit` and `opt`)
 LLVM_TOOLS_JLL_NAME := LLVM
@@ -75,16 +87,22 @@ OBJCONV_JLL_NAME := Objconv
 OBJCONV_JLL_VER  := 2.49.1+0
 
 # blastrampoline
-BLASTRAMPOLINE_VER := 5.1.0
 BLASTRAMPOLINE_JLL_NAME := libblastrampoline
+BLASTRAMPOLINE_VER := 5.1.0
+BLASTRAMPOLINE_BRANCH = v5.0.1
+BLASTRAMPOLINE_SHA1 = d32042273719672c6669f6442a0be5605d434b70
 
 # OpenBLAS
-OPENBLAS_VER := 0.3.17
 OPENBLAS_JLL_NAME := OpenBLAS
+OPENBLAS_VER := 0.3.17
+OPENBLAS_BRANCH = v0.3.20
+OPENBLAS_SHA1 = 0b678b19dc03f2a999d6e038814c4c50b9640a4e
 
 # OpenLibm
-OPENLIBM_VER := 0.8.1
 OPENLIBM_JLL_NAME := OpenLibm
+OPENLIBM_VER := 0.8.1
+OPENLIBM_BRANCH = v0.8.1
+OPENLIBM_SHA1 = ae2d91698508701c83cab83714d42a1146dccf85
 
 # Patchelf (we don't ship this or even use a JLL, we just always build it)
 PATCHELF_VER := 0.13
@@ -107,9 +125,15 @@ UNWIND_VER_TAG := 1.5
 UNWIND_JLL_NAME := LibUnwind
 UNWIND_JLL_VER  := 1.5.0+1
 
+# UTF8proc
+UTF8PROC_BRANCH = v2.7.0
+UTF8PROC_SHA1 = 8ca6144c85c165987cb1c5d8395c7314e13d4cd7
+
 # zlib
-ZLIB_VER := 1.2.12
 ZLIB_JLL_NAME := Zlib
+ZLIB_VER := 1.2.12
+ZLIB_BRANCH = v1.2.12
+ZLIB_SHA1 = 21767c654d31d2dccdde4330529775c6c5fd5389
 
 # Specify the version of the Mozilla CA Certificate Store to obtain.
 # The versions of cacert.pem are identified by the date (YYYY-MM-DD) of their changes.

diff --git a/deps/blastrampoline.version b/deps/blastrampoline.version
diff --git a/deps/libgit2.version b/deps/libgit2.version
diff --git a/deps/libssh2.version b/deps/libssh2.version
diff --git a/deps/libuv.version b/deps/libuv.version
diff --git a/deps/libwhich.version b/deps/libwhich.version
diff --git a/deps/llvm.version b/deps/llvm.version
diff --git a/deps/openblas.version b/deps/openblas.version
diff --git a/deps/openlibm.version b/deps/openlibm.version
diff --git a/deps/utf8proc.version b/deps/utf8proc.version
diff --git a/deps/zlib.version b/deps/zlib.version