JuliaLang · vtjnash · Jun 28, 2022 · Jun 16, 2022 · Jun 16, 2022 · Jun 16, 2022
diff --git a/base/Makefile b/base/Makefile
@@ -1,7 +1,6 @@
 SRCDIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
 BUILDDIR := .
 JULIAHOME := $(abspath $(SRCDIR)/..)
-include $(JULIAHOME)/deps/Versions.make
 include $(JULIAHOME)/Make.inc
 
 TAGGED_RELEASE_BANNER := ""

diff --git a/cli/Makefile b/cli/Makefile
@@ -1,7 +1,6 @@
 SRCDIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
 JULIAHOME := $(abspath $(SRCDIR)/..)
 BUILDDIR ?= .
-include $(JULIAHOME)/deps/Versions.make
 include $(JULIAHOME)/Make.inc
 include $(JULIAHOME)/deps/llvm-ver.make
 

diff --git a/deps/Makefile b/deps/Makefile
@@ -8,7 +8,6 @@ BUILDDIR := scratch
 else
 BUILDDIR := .
 endif
-include $(SRCDIR)/Versions.make
 include $(JULIAHOME)/Make.inc
 include $(SRCDIR)/tools/common.mk
 include $(SRCDIR)/tools/git-external.mk

diff --git a/deps/Versions.make b/deps/Versions.make
diff --git a/deps/blastrampoline.version b/deps/blastrampoline.version
@@ -1,2 +1,7 @@
+## jll artifact
+BLASTRAMPOLINE_JLL_NAME := libblastrampoline
+
+## source build
+BLASTRAMPOLINE_VER := 5.1.0
 BLASTRAMPOLINE_BRANCH=v5.0.1
 BLASTRAMPOLINE_SHA1=d32042273719672c6669f6442a0be5605d434b70
diff --git a/deps/clang.version b/deps/clang.version
@@ -0,0 +1,4 @@
+## jll artifact
+# Clang (paired with LLVM, only here as a JLL download)
+CLANG_JLL_NAME := Clang
+CLANG_JLL_VER  := 14.0.2+1
diff --git a/deps/csl.version b/deps/csl.version
@@ -0,0 +1,2 @@
+## jll artifact
+CSL_JLL_NAME := CompilerSupportLibraries
diff --git a/deps/curl.mk b/deps/curl.mk
@@ -1,4 +1,5 @@
 ## CURL ##
+include $(SRCDIR)/curl.version
 
 ifeq ($(USE_SYSTEM_LIBSSH2), 0)
 $(BUILDDIR)/curl-$(CURL_VER)/build-configured: | $(build_prefix)/manifest/libssh2

diff --git a/deps/curl.version b/deps/curl.version
@@ -0,0 +1,5 @@
+## jll artifact
+CURL_JLL_NAME := LibCURL
+
+## source build
+CURL_VER := 7.83.1
diff --git a/deps/dsfmt.mk b/deps/dsfmt.mk
@@ -1,4 +1,5 @@
 ## DSFMT ##
+include $(SRCDIR)/dsfmt.version
 
 ifneq ($(USE_BINARYBUILDER_DSFMT),1)
 

diff --git a/deps/dsfmt.version b/deps/dsfmt.version
@@ -0,0 +1,5 @@
+## jll artifact
+DSFMT_JLL_NAME := dSFMT
+
+## source build
+DSFMT_VER := 2.2.4
diff --git a/deps/gmp.mk b/deps/gmp.mk
@@ -1,4 +1,5 @@
 ## GMP ##
+include $(SRCDIR)/gmp.version
 
 ifeq ($(SANITIZE),1)
 GMP_CONFIGURE_OPTS += --disable-assembly

diff --git a/deps/gmp.version b/deps/gmp.version
@@ -0,0 +1,5 @@
+## jll artifact
+GMP_JLL_NAME := GMP
+
+## source build
+GMP_VER := 6.2.1
diff --git a/deps/libgit2.version b/deps/libgit2.version
@@ -1,2 +1,12 @@
+## jll artifact
+LIBGIT2_JLL_NAME := LibGit2
+
+## source build
 LIBGIT2_BRANCH=v1.3.0
 LIBGIT2_SHA1=b7bad55e4bb0a285b073ba5e02b01d3f522fc95d
+
+## Other deps
+# 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.
+# See https://curl.haxx.se/docs/caextract.html for more details.
+MOZILLA_CACERT_VERSION := 2022-02-01
diff --git a/deps/libssh2.version b/deps/libssh2.version
@@ -1,2 +1,7 @@
+## jll artifact
+LIBSSH2_JLL_NAME := LibSSH2
+
+## source build
+LIBSSH2_VER := 1.10.2
 LIBSSH2_BRANCH=libssh2-1.10.0
 LIBSSH2_SHA1=635caa90787220ac3773c1d5ba11f1236c22eae8
diff --git a/deps/libsuitesparse.mk b/deps/libsuitesparse.mk
@@ -1,4 +1,5 @@
 ## LIBSUITESPARSE ##
+include $(SRCDIR)/libsuitesparse.version
 
 ifeq ($(USE_BLAS64), 1)
 UMFPACK_CONFIG := -DLONGBLAS='long long'

diff --git a/deps/libsuitesparse.version b/deps/libsuitesparse.version
@@ -0,0 +1,5 @@
+## jll artifact
+LIBSUITESPARSE_JLL_NAME := SuiteSparse
+
+## source build
+LIBSUITESPARSE_VER := 5.10.1
diff --git a/deps/libuv.version b/deps/libuv.version
@@ -1,2 +1,7 @@
+## jll artifact
+LIBUV_JLL_NAME := LibUV
+
+## source build
+LIBUV_VER := 2
 LIBUV_BRANCH=julia-uv2-1.44.1
 LIBUV_SHA1=1b2d16477fe1142adea952168d828a066e03ee4c
diff --git a/deps/lld.version b/deps/lld.version
@@ -0,0 +1,3 @@
+## jll artifact
+LLD_JLL_NAME := LLD
+LLD_JLL_VER := 14.0.2+1
diff --git a/deps/llvm-tools.version b/deps/llvm-tools.version
@@ -0,0 +1,5 @@
+## jll artifact
+# LLVM_tools (downloads LLVM_jll to get things like `lit` and `opt`)
+LLVM_TOOLS_JLL_NAME := LLVM
+LLVM_TOOLS_JLL_VER := 14.0.2+1
+LLVM_TOOLS_ASSERT_JLL_VER := 14.0.2+1
diff --git a/deps/llvm.mk b/deps/llvm.mk
@@ -1,4 +1,5 @@
 ## LLVM ##
+include $(SRCDIR)/llvm.version
 include $(SRCDIR)/llvm-ver.make
 include $(SRCDIR)/llvm-options.mk
 

diff --git a/deps/llvm.version b/deps/llvm.version
@@ -1,2 +1,8 @@
+## jll artifact
+LLVM_JLL_NAME := libLLVM
+LLVM_ASSERT_JLL_VER := 14.0.2+1
+
+## source build
+LLVM_VER := 14.0.2
 LLVM_BRANCH=julia-14.0.2-1
 LLVM_SHA1=julia-14.0.2-1
diff --git a/deps/llvmunwind.version b/deps/llvmunwind.version
@@ -0,0 +1,5 @@
+## jll artifact
+LLVMUNWIND_JLL_NAME := LLVMLibUnwind
+
+## source build
+LLVMUNWIND_VER := 12.0.1
diff --git a/deps/mbedtls.mk b/deps/mbedtls.mk
@@ -1,4 +1,5 @@
 ## mbedtls
+include $(SRCDIR)/mbedtls.version
 
 ifneq ($(USE_BINARYBUILDER_MBEDTLS), 1)
 MBEDTLS_SRC = mbedtls-$(MBEDTLS_VER)

diff --git a/deps/mbedtls.version b/deps/mbedtls.version
@@ -0,0 +1,5 @@
+## jll artifact
+MBEDTLS_JLL_NAME := MbedTLS
+
+## source build
+MBEDTLS_VER := 2.28.0
diff --git a/deps/mpfr.mk b/deps/mpfr.mk
@@ -1,4 +1,5 @@
 ## MPFR ##
+include $(SRCDIR)/mpfr.version
 
 ifeq ($(USE_SYSTEM_GMP), 0)
 $(BUILDDIR)/mpfr-$(MPFR_VER)/build-configured: | $(build_prefix)/manifest/gmp

diff --git a/deps/mpfr.version b/deps/mpfr.version
@@ -0,0 +1,5 @@
+## jll artifact
+MPFR_JLL_NAME := MPFR
+
+## source build
+MPFR_VER := 4.1.0
diff --git a/deps/nghttp2.mk b/deps/nghttp2.mk
@@ -1,4 +1,5 @@
 ## nghttp2
+include $(SRCDIR)/nghttp2.version
 
 ifneq ($(USE_BINARYBUILDER_NGHTTP2), 1)
 

diff --git a/deps/nghttp2.version b/deps/nghttp2.version
@@ -0,0 +1,5 @@
+## jll artifact
+NGHTTP2_JLL_NAME := nghttp2
+
+## source build
+NGHTTP2_VER := 1.47.0
diff --git a/deps/objconv.mk b/deps/objconv.mk
@@ -1,4 +1,5 @@
 ## objconv ##
+include $(SRCDIR)/objconv.version
 
 ifneq ($(USE_BINARYBUILDER_OBJCONV),1)
 

diff --git a/deps/objconv.version b/deps/objconv.version
@@ -0,0 +1,7 @@
+## jll artifact
+# Objconv (we don't ship this, so no need for a fake JLL; therefore we specify the JLL_VER here)
+OBJCONV_JLL_NAME := Objconv
+OBJCONV_JLL_VER  := 2.49.1+0
+
+## source build
+OBJCONV_VER := 2.49.1
diff --git a/deps/openblas.version b/deps/openblas.version
@@ -1,2 +1,10 @@
+## jll artifact
+OPENBLAS_JLL_NAME := OpenBLAS
+
+## source build
+OPENBLAS_VER := 0.3.17
 OPENBLAS_BRANCH=v0.3.20
 OPENBLAS_SHA1=0b678b19dc03f2a999d6e038814c4c50b9640a4e
+
+# LAPACK, source-only
+LAPACK_VER := 3.9.0
diff --git a/deps/openlibm.version b/deps/openlibm.version
@@ -1,2 +1,7 @@
+## jll artifact
+OPENLIBM_JLL_NAME := OpenLibm
+
+## source build
+OPENLIBM_VER := 0.8.1
 OPENLIBM_BRANCH=v0.8.1
 OPENLIBM_SHA1=ae2d91698508701c83cab83714d42a1146dccf85
diff --git a/deps/p7zip.mk b/deps/p7zip.mk
@@ -1,4 +1,5 @@
 ## p7zip ##
+include $(SRCDIR)/p7zip.version
 
 ifneq ($(USE_BINARYBUILDER_P7ZIP),1)
 

diff --git a/deps/p7zip.version b/deps/p7zip.version
@@ -0,0 +1,5 @@
+## jll artifact
+P7ZIP_JLL_NAME := p7zip
+
+## source build
+P7ZIP_VER := 17.04
diff --git a/deps/patchelf.mk b/deps/patchelf.mk
@@ -1,4 +1,5 @@
 ## patchelf ##
+include $(SRCDIR)/patchelf.version
 
 $(SRCCACHE)/patchelf-$(PATCHELF_VER).tar.bz2: | $(SRCCACHE)
 	$(JLDOWNLOAD) $@ https://github.com/NixOS/patchelf/releases/download/$(PATCHELF_VER)/patchelf-$(PATCHELF_VER).tar.bz2

diff --git a/deps/patchelf.version b/deps/patchelf.version
@@ -0,0 +1,3 @@
+## source build
+# Patchelf (we don't ship this or even use a JLL, we just always build it)
+PATCHELF_VER := 0.13
diff --git a/deps/pcre.mk b/deps/pcre.mk
@@ -1,4 +1,5 @@
 ## PCRE ##
+include $(SRCDIR)/pcre.version
 
 ifneq ($(USE_BINARYBUILDER_PCRE),1)
 # Force optimization for PCRE flags (Issue #11668)

diff --git a/deps/pcre.version b/deps/pcre.version
@@ -0,0 +1,5 @@
+## jll artifact
+PCRE_JLL_NAME := PCRE2
+
+## source build
+PCRE_VER := 10.40
diff --git a/deps/tools/bb-install.mk b/deps/tools/bb-install.mk
@@ -5,6 +5,7 @@
 #    4 cxx11)                  # signifies a cxx11 ABI dependency
 
 define bb-install
+include $$(SRCDIR)/$1.version
 TRIPLET_VAR := BB_TRIPLET
 ifeq ($(3),true)
 TRIPLET_VAR := $$(TRIPLET_VAR)_LIBGFORTRAN

diff --git a/deps/unwind.mk b/deps/unwind.mk
@@ -1,4 +1,6 @@
 ## UNWIND ##
+include $(SRCDIR)/unwind.version
+include $(SRCDIR)/llvmunwind.version
 
 ifneq ($(USE_BINARYBUILDER_LIBUNWIND),1)
 LIBUNWIND_CFLAGS := -U_FORTIFY_SOURCE $(fPIC) -lz

diff --git a/deps/unwind.version b/deps/unwind.version
@@ -0,0 +1,6 @@
+## jll artifact
+UNWIND_JLL_NAME := LibUnwind
+
+## source build
+UNWIND_VER_TAG := 1.5
+UNWIND_VER := 1.5.0
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		## jll artifact
		CSL_JLL_NAME := CompilerSupportLibraries