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
Prev Previous commit
Next Next commit
Makefile: use LF for all makefiles
  • Loading branch information
@inkydragon
inkydragon committed Jun 16, 2022
commit 2c12e0f3e8f22f6cf9eca3a1acb02b898fafcf59
8 changes: 4 additions & 4 deletions deps/clang.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## jll artifact
# Clang (paired with LLVM, only here as a JLL download)
CLANG_JLL_NAME := Clang
CLANG_JLL_VER := 13.0.1+0
## jll artifact
# Clang (paired with LLVM, only here as a JLL download)
CLANG_JLL_NAME := Clang
CLANG_JLL_VER := 13.0.1+0
4 changes: 2 additions & 2 deletions deps/csl.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
## jll artifact
CSL_JLL_NAME := CompilerSupportLibraries
## jll artifact
CSL_JLL_NAME := CompilerSupportLibraries
10 changes: 5 additions & 5 deletions deps/curl.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## jll artifact
CURL_JLL_NAME := LibCURL
## source build
CURL_VER := 7.83.1
## jll artifact
CURL_JLL_NAME := LibCURL

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

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

## source build
GMP_VER := 6.2.1
10 changes: 5 additions & 5 deletions deps/libsuitesparse.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## jll artifact
LIBSUITESPARSE_JLL_NAME := SuiteSparse
## source build
LIBSUITESPARSE_VER := 5.10.1
## jll artifact
LIBSUITESPARSE_JLL_NAME := SuiteSparse

## source build
LIBSUITESPARSE_VER := 5.10.1
10 changes: 5 additions & 5 deletions deps/llvm-tools.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +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 := 13.0.1+0
LLVM_TOOLS_ASSERT_JLL_VER := 13.0.1+0
## jll artifact
# 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
10 changes: 5 additions & 5 deletions deps/llvmunwind.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## jll artifact
LLVMUNWIND_JLL_NAME := LLVMLibUnwind
## source build
LLVMUNWIND_VER := 12.0.1
## jll artifact
LLVMUNWIND_JLL_NAME := LLVMLibUnwind

## source build
LLVMUNWIND_VER := 12.0.1
10 changes: 5 additions & 5 deletions deps/mbedtls.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## jll artifact
MBEDTLS_JLL_NAME := MbedTLS
## source build
MBEDTLS_VER := 2.28.0
## jll artifact
MBEDTLS_JLL_NAME := MbedTLS

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

## source build
MPFR_VER := 4.1.0
inkydragon marked this conversation as resolved.
Show resolved Hide resolved
10 changes: 5 additions & 5 deletions deps/nghttp2.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## jll artifact
NGHTTP2_JLL_NAME := nghttp2
## source build
NGHTTP2_VER := 1.47.0
## jll artifact
NGHTTP2_JLL_NAME := nghttp2

## source build
NGHTTP2_VER := 1.47.0
14 changes: 7 additions & 7 deletions deps/objconv.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +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
## jll artifact
# Objconv (we don't ship this, so no need for a fake JLL; therefore we specify the JLL_VER here)
inkydragon marked this conversation as resolved.
Show resolved Hide resolved
OBJCONV_JLL_NAME := Objconv
OBJCONV_JLL_VER := 2.49.1+0

## source build
OBJCONV_VER := 2.49.1
10 changes: 5 additions & 5 deletions deps/p7zip.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## jll artifact
P7ZIP_JLL_NAME := p7zip
## source build
P7ZIP_VER := 17.04
## jll artifact
P7ZIP_JLL_NAME := p7zip

## source build
P7ZIP_VER := 17.04
6 changes: 3 additions & 3 deletions deps/patchelf.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
## source build
# Patchelf (we don't ship this or even use a JLL, we just always build it)
PATCHELF_VER := 0.13
## source build
# Patchelf (we don't ship this or even use a JLL, we just always build it)
PATCHELF_VER := 0.13
10 changes: 5 additions & 5 deletions deps/pcre.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## jll artifact
PCRE_JLL_NAME := PCRE2
## source build
PCRE_VER := 10.40
## jll artifact
PCRE_JLL_NAME := PCRE2

## source build
PCRE_VER := 10.40
14 changes: 7 additions & 7 deletions deps/unwind.version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## jll artifact
UNWIND_JLL_NAME := LibUnwind
UNWIND_JLL_VER := 1.5.0+1
## source build
UNWIND_VER_TAG := 1.5
UNWIND_VER := 1.5.0
## jll artifact
UNWIND_JLL_NAME := LibUnwind
UNWIND_JLL_VER := 1.5.0+1
inkydragon marked this conversation as resolved.
Show resolved Hide resolved

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