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.

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

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

Merged
merged 31 commits into from
Jun 28, 2022
Merged
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
deps: rm Versions.make
  • Loading branch information
inkydragon committed Jun 16, 2022
commit b33e5c26969cad540a8210d509fe294f5e3fa96b
1 change: 0 additions & 1 deletion base/Makefile
Original file line number Diff line number Diff line change
@@ -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 := ""
Expand Down
1 change: 0 additions & 1 deletion cli/Makefile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
1 change: 0 additions & 1 deletion deps/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion deps/Versions.make

This file was deleted.

2 changes: 1 addition & 1 deletion doc/src/devdocs/build/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ Julia uses the following external libraries, which are automatically
downloaded (or in a few cases, included in the Julia source
repository) and then compiled from source the first time you run
`make`. The specific version numbers of these libraries that Julia
uses are listed in [`deps/Versions.make`](https://github.com/JuliaLang/julia/blob/master/deps/Versions.make):
uses are listed in [`deps/$(LibName).version`](https://github.com/JuliaLang/julia/blob/master/deps/):

- **[LLVM]** (9.0 + [patches](https://github.com/JuliaLang/julia/tree/master/deps/patches)) — compiler infrastructure (see [note below](#llvm)).
- **[FemtoLisp]** — packaged with Julia source, and used to implement the compiler front-end.
Expand Down
2 changes: 1 addition & 1 deletion doc/src/devdocs/llvm.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ The `-O` option enables LLVM's [Basic Alias Analysis](https://llvm.org/docs/Alia

## Building Julia with a different version of LLVM

The default version of LLVM is specified in `deps/Versions.make`. You can override it by creating
The default version of LLVM is specified in `deps/llvm.version`. You can override it by creating
a file called `Make.user` in the top-level directory and adding a line to it such as:

```
Expand Down
1 change: 0 additions & 1 deletion src/Makefile
Original file line number Diff line number Diff line change
@@ -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

Expand Down
3 changes: 1 addition & 2 deletions stdlib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ SRCCACHE := $(abspath $(SRCDIR)/srccache)
BUILDDIR := .

include $(JULIAHOME)/Make.inc
include $(JULIAHOME)/deps/Versions.make
include $(JULIAHOME)/deps/tools/common.mk
include $(JULIAHOME)/deps/tools/stdlib-external.mk

Expand All @@ -19,7 +18,7 @@ JLLS = DSFMT GMP CURL LIBGIT2 LLVM LIBSSH2 LIBUV MBEDTLS MPFR NGHTTP2 \
BLASTRAMPOLINE OPENBLAS OPENLIBM P7ZIP PCRE LIBSUITESPARSE ZLIB \
LLVMUNWIND CSL UNWIND

# Initialize this with JLLs that aren't in deps/Versions.make
# Initialize this with JLLs that aren't in "deps/$(LibName).version"
JLL_NAMES := MozillaCACerts_jll
get-MozillaCACerts_jll:
install-MozillaCACerts_jll:
Expand Down