Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[deps] split Versions.make into standalone *.version file #45720

Merged
merged 31 commits into from
Jun 28, 2022
Merged

[deps] split Versions.make into standalone *.version file #45720

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
ba0d45d
deps: split `Versions.make` into standalone `*.version` file
inkydragon Jun 16, 2022
3920564
repo: update `julia.spdx.json`
inkydragon Jun 16, 2022
b33e5c2
deps: rm `Versions.make`
inkydragon Jun 16, 2022
9e14d10
deps: include `$(LibName).version`
inkydragon Jun 16, 2022
07c6f39
deps: split `unwind.version`, add new `llvmunwind.version`
inkydragon Jun 16, 2022
99a4538
deps: split `llvm.version` into `clang.version` + `llvm-tools.version`
inkydragon Jun 16, 2022
c1c0910
stdlib: Add new makefile `all_jlls.version` to include all `_jll` names
inkydragon Jun 16, 2022
2c12e0f
Makefile: use `LF` for all makefiles
inkydragon Jun 16, 2022
0d727d4
deps/llvm: include `llvm.version`
inkydragon Jun 17, 2022
bda346a
Merge branch 'master' into build-rm-Versions.make
inkydragon Jun 17, 2022
1850865
deps/llvm: adjust include sequence, include `.version` first
inkydragon Jun 17, 2022
741cd3a
Merge branch 'master' into build-rm-Versions.make
inkydragon Jun 18, 2022
809a97f
deps/llvm: update to 14.0.2
inkydragon Jun 18, 2022
badc75d
Update deps/unwind.version
inkydragon Jun 18, 2022
ba29534
Merge branch 'build-rm-Versions.make' of github.com:inkydragon/julia …
inkydragon Jun 18, 2022
bae11d8
deps/LibUnwind_jll: fix version mismatch (`Project.toml` and `checksum`)
inkydragon Jun 18, 2022
90b6055
Update deps/llvm-tools.version
inkydragon Jun 18, 2022
634ceca
Merge branch 'build-rm-Versions.make' of github.com:inkydragon/julia …
inkydragon Jun 18, 2022
fd42fe3
Update OPENBLAS_VER to 0.3.20
ViralBShah Jun 19, 2022
2b47176
Merge branch 'master' into build-rm-Versions.make
inkydragon Jun 20, 2022
3e4ffb0
deps: merge patches for `Versions.make`
inkydragon Jun 20, 2022
5051246
Update stdlib/all_jlls.version
inkydragon Jun 20, 2022
9e15c30
deps/mpfr: add comments for version mismatch
inkydragon Jun 20, 2022
212eab6
Update deps/objconv.version
inkydragon Jun 21, 2022
6d01064
Update stdlib/all_jlls.version
inkydragon Jun 21, 2022
9e7b058
deps: add a TODO in `all_jlls.version`
inkydragon Jun 21, 2022
306eb9f
Merge branch 'build-rm-Versions.make' of github.com:inkydragon/julia …
inkydragon Jun 21, 2022
677e476
Merge branch 'master' into build-rm-Versions.make
inkydragon Jun 21, 2022
44a22d2
Merge branch 'master' into build-rm-Versions.make
inkydragon Jun 22, 2022
fd69fab
deps: apply patches from `deps/Versions.make`
inkydragon Jun 22, 2022
fd1b4d0
Merge branch 'master' into build-rm-Versions.make
inkydragon Jun 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
deps: split Versions.make into standalone *.version file
  • Loading branch information
@inkydragon
inkydragon committed Jun 16, 2022
commit ba0d45d88280223c757ccadb85129f5ed229ff97
118 changes: 1 addition & 117 deletions deps/Versions.make
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,117 +1 @@
## Dependencies and where to find them, listed in alphabetical order

# To define a new dependency, you need to know the following pieces of information:
#
# * The Makefile variable stem; for LibCURL this is just "CURL".
# * The JLL name; for GMP this is "GMP", while for LLVM it could be "LLVM_full" or "LLVM_full_assert"
# * The upstream source version; for dSFMT this is currently "2.2.3"
#
# Everything else will be auto-generated. In particular, the version listed here
# represents the upstream source version; the JLL binary version that gets downloaded is
# controlled by the `Project.toml` files in `stdlib/XXX_jll/`.

# Compiler Support Libraries
CSL_JLL_NAME := CompilerSupportLibraries

# Clang (paired with LLVM, only here as a JLL download)
CLANG_JLL_NAME := Clang
CLANG_JLL_VER := 13.0.1+0

# DSFMT
DSFMT_VER := 2.2.4
DSFMT_JLL_NAME := dSFMT

# GMP
GMP_VER := 6.2.1
GMP_JLL_NAME := GMP

# LibCURL
CURL_VER := 7.83.1
CURL_JLL_NAME := LibCURL

# LAPACK, source-only
LAPACK_VER := 3.9.0

# LibGit2
LIBGIT2_JLL_NAME := LibGit2

# LibSSH2
LIBSSH2_VER := 1.10.2
LIBSSH2_JLL_NAME := LibSSH2

# LibUV
LIBUV_VER := 2
LIBUV_JLL_NAME := LibUV

# LLVM
LLVM_VER := 13.0.1
LLVM_ASSERT_JLL_VER := 13.0.1+0
LLVM_JLL_NAME := libLLVM

# LLVM_tools (downloads LLVM_jll to get things like `lit` and `opt`)
LLVM_TOOLS_JLL_NAME := LLVM
LLVM_TOOLS_JLL_VER := 13.0.1+0
LLVM_TOOLS_ASSERT_JLL_VER := 13.0.1+0

# LLVM libunwind
LLVMUNWIND_VER := 12.0.1
LLVMUNWIND_JLL_NAME := LLVMLibUnwind

# MbedTLS
MBEDTLS_VER := 2.28.0
MBEDTLS_JLL_NAME := MbedTLS

# MPFR
MPFR_VER := 4.1.0
MPFR_JLL_NAME := MPFR

# nghttp2
NGHTTP2_VER := 1.47.0
NGHTTP2_JLL_NAME := nghttp2

# Objconv (we don't ship this, so no need for a fake JLL; therefore we specify the JLL_VER here)
OBJCONV_VER := 2.49.1
OBJCONV_JLL_NAME := Objconv
OBJCONV_JLL_VER := 2.49.1+0

# blastrampoline
BLASTRAMPOLINE_VER := 5.1.0
BLASTRAMPOLINE_JLL_NAME := libblastrampoline

# OpenBLAS
OPENBLAS_VER := 0.3.17
OPENBLAS_JLL_NAME := OpenBLAS

# OpenLibm
OPENLIBM_VER := 0.8.1
OPENLIBM_JLL_NAME := OpenLibm

# Patchelf (we don't ship this or even use a JLL, we just always build it)
PATCHELF_VER := 0.13

# p7zip
P7ZIP_VER := 17.04
P7ZIP_JLL_NAME := p7zip

# PCRE
PCRE_VER := 10.40
PCRE_JLL_NAME := PCRE2

# SuiteSparse
LIBSUITESPARSE_VER := 5.10.1
LIBSUITESPARSE_JLL_NAME := SuiteSparse

# unwind
UNWIND_VER := 1.5.0
UNWIND_VER_TAG := 1.5
UNWIND_JLL_NAME := LibUnwind
UNWIND_JLL_VER := 1.5.0+1

# zlib
ZLIB_VER := 1.2.12
ZLIB_JLL_NAME := Zlib

# 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
# TODO: rm this
5 changes: 5 additions & 0 deletions deps/blastrampoline.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
## jll artifact
BLASTRAMPOLINE_JLL_NAME := libblastrampoline

## source build
BLASTRAMPOLINE_VER := 5.1.0
BLASTRAMPOLINE_BRANCH=v5.0.1
inkydragon marked this conversation as resolved.
Show resolved Hide resolved
BLASTRAMPOLINE_SHA1=d32042273719672c6669f6442a0be5605d434b70
2 changes: 2 additions & 0 deletions deps/csl.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
## jll artifact
CSL_JLL_NAME := CompilerSupportLibraries
5 changes: 5 additions & 0 deletions deps/curl.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## jll artifact
CURL_JLL_NAME := LibCURL

## source build
CURL_VER := 7.83.1
5 changes: 5 additions & 0 deletions deps/dsfmt.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## jll artifact
DSFMT_JLL_NAME := dSFMT

## source build
DSFMT_VER := 2.2.4
5 changes: 5 additions & 0 deletions deps/gmp.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## jll artifact
GMP_JLL_NAME := GMP

## source build
GMP_VER := 6.2.1
10 changes: 10 additions & 0 deletions deps/libgit2.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Comment on lines +8 to +12
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@inkydragon why this is here instead of its own file?

Copy link
Sponsor Member Author

@inkydragon inkydragon Oct 15, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Because libgit2 depends on it directly.
The download and installation code is also placed in libgit2.mk.

CA certificates can be split out as a separate dependency if necessary.

5 changes: 5 additions & 0 deletions deps/libssh2.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
## jll artifact
LIBSSH2_JLL_NAME := LibSSH2

## source build
LIBSSH2_VER := 1.10.2
LIBSSH2_BRANCH=libssh2-1.10.0
Comment on lines +5 to 6
Copy link
Sponsor Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Version mismatch, ref: #43250

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@nalimilan Any thoughts on how to address this one?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1.10.2 doesn't exist upstream, AFAICT that's a trick used in Yggdrasil. Cf. #43250 (comment) Maybe @mkitti knows.

LIBSSH2_SHA1=635caa90787220ac3773c1d5ba11f1236c22eae8
5 changes: 5 additions & 0 deletions deps/libsuitesparse.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## jll artifact
LIBSUITESPARSE_JLL_NAME := SuiteSparse

## source build
LIBSUITESPARSE_VER := 5.10.1
5 changes: 5 additions & 0 deletions deps/libuv.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
17 changes: 17 additions & 0 deletions deps/llvm.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,19 @@
## jll artifact
# LLVM
LLVM_JLL_NAME := libLLVM
LLVM_ASSERT_JLL_VER := 13.0.1+0

# Clang (paired with LLVM, only here as a JLL download)
CLANG_JLL_NAME := Clang
CLANG_JLL_VER := 13.0.1+0

# LLVM_tools (downloads LLVM_jll to get things like `lit` and `opt`)
LLVM_TOOLS_JLL_NAME := LLVM
LLVM_TOOLS_JLL_VER := 13.0.1+0
LLVM_TOOLS_ASSERT_JLL_VER := 13.0.1+0


## source build
LLVM_VER := 13.0.1
LLVM_BRANCH=julia-13.0.1-0
LLVM_SHA1=julia-13.0.1-0
5 changes: 5 additions & 0 deletions deps/mbedtls.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## jll artifact
MBEDTLS_JLL_NAME := MbedTLS

## source build
MBEDTLS_VER := 2.28.0
5 changes: 5 additions & 0 deletions deps/mpfr.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## jll artifact
MPFR_JLL_NAME := MPFR

## source build
MPFR_VER := 4.1.0
5 changes: 5 additions & 0 deletions deps/nghttp2.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## jll artifact
NGHTTP2_JLL_NAME := nghttp2

## source build
NGHTTP2_VER := 1.47.0
7 changes: 7 additions & 0 deletions deps/objconv.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
8 changes: 8 additions & 0 deletions deps/openblas.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,10 @@
## jll artifact
OPENBLAS_JLL_NAME := OpenBLAS

## source build
OPENBLAS_VER := 0.3.17
OPENBLAS_BRANCH=v0.3.20
ViralBShah marked this conversation as resolved.
Show resolved Hide resolved
OPENBLAS_SHA1=0b678b19dc03f2a999d6e038814c4c50b9640a4e

# LAPACK, source-only
LAPACK_VER := 3.9.0
5 changes: 5 additions & 0 deletions deps/openlibm.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions deps/p7zip.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## jll artifact
P7ZIP_JLL_NAME := p7zip

## source build
P7ZIP_VER := 17.04
3 changes: 3 additions & 0 deletions deps/patchelf.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions deps/pcre.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
## jll artifact
PCRE_JLL_NAME := PCRE2

## source build
PCRE_VER := 10.40
16 changes: 16 additions & 0 deletions deps/unwind.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
## jll artifact
# LibUnwind
UNWIND_JLL_NAME := LibUnwind
UNWIND_JLL_VER := 1.5.0+1

# LLVM libunwind
LLVMUNWIND_JLL_NAME := LLVMLibUnwind


## source build
# LibUnwind
UNWIND_VER_TAG := 1.5
UNWIND_VER := 1.5.0

# LLVM libunwind
LLVMUNWIND_VER := 12.0.1
5 changes: 5 additions & 0 deletions deps/zlib.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
## jll artifact
ZLIB_JLL_NAME := Zlib

## source build
ZLIB_VER := 1.2.12
ZLIB_BRANCH=v1.2.12
ZLIB_SHA1=21767c654d31d2dccdde4330529775c6c5fd5389