Skip to content

Commit a8d1d36

Browse files
inkydragoninkydragon
authored
[deps] split Versions.make into standalone *.version file (#45720)
* deps: include `$(LibName).version` * deps: rm `Versions.make` * repo: update `julia.spdx.json` * deps: split `unwind.version`, add new `llvmunwind.version` * deps: split `llvm.version` into `clang.version` + `llvm-tools.version` * stdlib: Add new makefile `all_jlls.version` to include all `_jll` names * deps/LibUnwind_jll: fix version mismatch (`Project.toml` and `checksum`), xref: #42782
1 parent 4015e0d commit a8d1d36

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+194
-139
lines changed

‎base/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
SRCDIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
22
BUILDDIR := .
33
JULIAHOME := $(abspath $(SRCDIR)/..)
4-
include $(JULIAHOME)/deps/Versions.make
54
include $(JULIAHOME)/Make.inc
65

76
TAGGED_RELEASE_BANNER := ""

‎cli/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
SRCDIR := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
22
JULIAHOME := $(abspath $(SRCDIR)/..)
33
BUILDDIR ?= .
4-
include $(JULIAHOME)/deps/Versions.make
54
include $(JULIAHOME)/Make.inc
65
include $(JULIAHOME)/deps/llvm-ver.make
76

‎deps/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ BUILDDIR := scratch
88
else
99
BUILDDIR := .
1010
endif
11-
include $(SRCDIR)/Versions.make
1211
include $(JULIAHOME)/Make.inc
1312
include $(SRCDIR)/tools/common.mk
1413
include $(SRCDIR)/tools/git-external.mk

‎deps/Versions.make

Lines changed: 0 additions & 120 deletions
This file was deleted.

‎deps/blastrampoline.version

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
## jll artifact
2+
BLASTRAMPOLINE_JLL_NAME := libblastrampoline
3+
4+
## source build
5+
BLASTRAMPOLINE_VER := 5.1.1
16
BLASTRAMPOLINE_BRANCH=v5.1.1
27
BLASTRAMPOLINE_SHA1=bac2f810d523003fbb431ecc6e9ea81c8b86e2d6

‎deps/clang.version

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
## jll artifact
2+
# Clang (paired with LLVM, only here as a JLL download)
3+
CLANG_JLL_NAME := Clang
4+
CLANG_JLL_VER := 14.0.5+0

‎deps/csl.version

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
## jll artifact
2+
CSL_JLL_NAME := CompilerSupportLibraries

‎deps/curl.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
## CURL ##
2+
include $(SRCDIR)/curl.version
23

34
ifeq ($(USE_SYSTEM_LIBSSH2), 0)
45
$(BUILDDIR)/curl-$(CURL_VER)/build-configured: | $(build_prefix)/manifest/libssh2

‎deps/curl.version

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## jll artifact
2+
CURL_JLL_NAME := LibCURL
3+
4+
## source build
5+
CURL_VER := 7.83.1

‎deps/dsfmt.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
## DSFMT ##
2+
include $(SRCDIR)/dsfmt.version
23

34
ifneq ($(USE_BINARYBUILDER_DSFMT),1)
45

‎deps/dsfmt.version

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## jll artifact
2+
DSFMT_JLL_NAME := dSFMT
3+
4+
## source build
5+
DSFMT_VER := 2.2.4

‎deps/gmp.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
## GMP ##
2+
include $(SRCDIR)/gmp.version
23

34
ifeq ($(SANITIZE),1)
45
GMP_CONFIGURE_OPTS += --disable-assembly

‎deps/gmp.version

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## jll artifact
2+
GMP_JLL_NAME := GMP
3+
4+
## source build
5+
GMP_VER := 6.2.1

‎deps/libgit2.version

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,12 @@
1+
## jll artifact
2+
LIBGIT2_JLL_NAME := LibGit2
3+
4+
## source build
15
LIBGIT2_BRANCH=v1.4.3
26
LIBGIT2_SHA1=465bbf88ea939a965fbcbade72870c61f815e457
7+
8+
## Other deps
9+
# Specify the version of the Mozilla CA Certificate Store to obtain.
10+
# The versions of cacert.pem are identified by the date (YYYY-MM-DD) of their changes.
11+
# See https://curl.haxx.se/docs/caextract.html for more details.
12+
MOZILLA_CACERT_VERSION := 2022-02-01

‎deps/libssh2.version

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
## jll artifact
2+
LIBSSH2_JLL_NAME := LibSSH2
3+
4+
## source build
5+
LIBSSH2_VER := 1.10.2
16
LIBSSH2_BRANCH=libssh2-1.10.0
27
LIBSSH2_SHA1=635caa90787220ac3773c1d5ba11f1236c22eae8

‎deps/libsuitesparse.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
## LIBSUITESPARSE ##
2+
include $(SRCDIR)/libsuitesparse.version
23

34
ifeq ($(USE_BLAS64), 1)
45
UMFPACK_CONFIG := -DLONGBLAS='long long'

‎deps/libsuitesparse.version

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## jll artifact
2+
LIBSUITESPARSE_JLL_NAME := SuiteSparse
3+
4+
## source build
5+
LIBSUITESPARSE_VER := 5.10.1

‎deps/libuv.version

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
## jll artifact
2+
LIBUV_JLL_NAME := LibUV
3+
4+
## source build
5+
LIBUV_VER := 2
16
LIBUV_BRANCH=julia-uv2-1.44.1
27
LIBUV_SHA1=1b2d16477fe1142adea952168d828a066e03ee4c

‎deps/lld.version

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## jll artifact
2+
LLD_JLL_NAME := LLD
3+
LLD_JLL_VER := 14.0.5+0

‎deps/llvm-tools.version

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## jll artifact
2+
# LLVM_tools (downloads LLVM_jll to get things like `lit` and `opt`)
3+
LLVM_TOOLS_JLL_NAME := LLVM
4+
LLVM_TOOLS_JLL_VER := 14.0.5+0
5+
LLVM_TOOLS_ASSERT_JLL_VER := 14.0.5+0

‎deps/llvm.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
## LLVM ##
2+
include $(SRCDIR)/llvm.version
23
include $(SRCDIR)/llvm-ver.make
34
include $(SRCDIR)/llvm-options.mk
45

‎deps/llvm.version

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,8 @@
1+
## jll artifact
2+
LLVM_JLL_NAME := libLLVM
3+
LLVM_ASSERT_JLL_VER := 14.0.5+0
4+
5+
## source build
6+
LLVM_VER := 14.0.2
17
LLVM_BRANCH=julia-14.0.5-0
28
LLVM_SHA1=julia-14.0.5-0

‎deps/llvmunwind.version

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## jll artifact
2+
LLVMUNWIND_JLL_NAME := LLVMLibUnwind
3+
4+
## source build
5+
LLVMUNWIND_VER := 12.0.1

‎deps/mbedtls.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
## mbedtls
2+
include $(SRCDIR)/mbedtls.version
23

34
ifneq ($(USE_BINARYBUILDER_MBEDTLS), 1)
45
MBEDTLS_SRC = mbedtls-$(MBEDTLS_VER)

‎deps/mbedtls.version

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## jll artifact
2+
MBEDTLS_JLL_NAME := MbedTLS
3+
4+
## source build
5+
MBEDTLS_VER := 2.28.0

‎deps/mpfr.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
## MPFR ##
2+
include $(SRCDIR)/mpfr.version
23

34
ifeq ($(USE_SYSTEM_GMP), 0)
45
$(BUILDDIR)/mpfr-$(MPFR_VER)/build-configured: | $(build_prefix)/manifest/gmp

‎deps/mpfr.version

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
## jll artifact
2+
MPFR_JLL_NAME := MPFR
3+
4+
## source build
5+
MPFR_VER := 4.1.0
6+
7+
# Note: jll use a different version `4.1.1+1` ("stdlib/MPFR_jll/Project.toml")
8+
# See notes in build_tarballs.jl
9+
# https://github.com/JuliaPackaging/Yggdrasil/blob/3c877e18dd9bb9b2e79415e00f661a7e37b2aea9/M/MPFR/build_tarballs.jl#L40-L42

‎deps/nghttp2.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
## nghttp2
2+
include $(SRCDIR)/nghttp2.version
23

34
ifneq ($(USE_BINARYBUILDER_NGHTTP2), 1)
45

‎deps/nghttp2.version

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## jll artifact
2+
NGHTTP2_JLL_NAME := nghttp2
3+
4+
## source build
5+
NGHTTP2_VER := 1.47.0

‎deps/objconv.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
## objconv ##
2+
include $(SRCDIR)/objconv.version
23

34
ifneq ($(USE_BINARYBUILDER_OBJCONV),1)
45

‎deps/objconv.version

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
## jll artifact
2+
# Objconv (we don't ship this, so no need for a fake JLL; therefore we specify the JLL_VER here instead of in a `stdlib/Objconv_jll/Project.toml` file)
3+
OBJCONV_JLL_NAME := Objconv
4+
OBJCONV_JLL_VER := 2.49.1+0
5+
6+
## source build
7+
OBJCONV_VER := 2.49.1

‎deps/openblas.version

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,10 @@
1+
## jll artifact
2+
OPENBLAS_JLL_NAME := OpenBLAS
3+
4+
## source build
5+
OPENBLAS_VER := 0.3.20
16
OPENBLAS_BRANCH=v0.3.20
27
OPENBLAS_SHA1=0b678b19dc03f2a999d6e038814c4c50b9640a4e
8+
9+
# LAPACK, source-only
10+
LAPACK_VER := 3.9.0

‎deps/openlibm.version

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
## jll artifact
2+
OPENLIBM_JLL_NAME := OpenLibm
3+
4+
## source build
5+
OPENLIBM_VER := 0.8.1
16
OPENLIBM_BRANCH=v0.8.1
27
OPENLIBM_SHA1=ae2d91698508701c83cab83714d42a1146dccf85

‎deps/p7zip.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
## p7zip ##
2+
include $(SRCDIR)/p7zip.version
23

34
ifneq ($(USE_BINARYBUILDER_P7ZIP),1)
45

‎deps/p7zip.version

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## jll artifact
2+
P7ZIP_JLL_NAME := p7zip
3+
4+
## source build
5+
P7ZIP_VER := 17.04

‎deps/patchelf.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
## patchelf ##
2+
include $(SRCDIR)/patchelf.version
23

34
$(SRCCACHE)/patchelf-$(PATCHELF_VER).tar.bz2: | $(SRCCACHE)
45
$(JLDOWNLOAD) $@ https://github.com/NixOS/patchelf/releases/download/$(PATCHELF_VER)/patchelf-$(PATCHELF_VER).tar.bz2

‎deps/patchelf.version

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## source build
2+
# Patchelf (we don't ship this or even use a JLL, we just always build it)
3+
PATCHELF_VER := 0.13

‎deps/pcre.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
## PCRE ##
2+
include $(SRCDIR)/pcre.version
23

34
ifneq ($(USE_BINARYBUILDER_PCRE),1)
45
# Force optimization for PCRE flags (Issue #11668)

‎deps/pcre.version

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
## jll artifact
2+
PCRE_JLL_NAME := PCRE2
3+
4+
## source build
5+
PCRE_VER := 10.40

‎deps/tools/bb-install.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# 4 cxx11) # signifies a cxx11 ABI dependency
66

77
define bb-install
8+
include $$(SRCDIR)/$1.version
89
TRIPLET_VAR := BB_TRIPLET
910
ifeq ($(3),true)
1011
TRIPLET_VAR := $$(TRIPLET_VAR)_LIBGFORTRAN

‎deps/unwind.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
## UNWIND ##
2+
include $(SRCDIR)/unwind.version
3+
include $(SRCDIR)/llvmunwind.version
24

35
ifneq ($(USE_BINARYBUILDER_LIBUNWIND),1)
46
LIBUNWIND_CFLAGS := -U_FORTIFY_SOURCE $(fPIC) -lz

‎deps/unwind.version

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
## jll artifact
2+
UNWIND_JLL_NAME := LibUnwind
3+
4+
## source build
5+
UNWIND_VER_TAG := 1.5
6+
UNWIND_VER := 1.5.0

0 commit comments

Comments
 (0)