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

inkydragon · 2022-06-17T07:48:21Z

But we could probably move the BB versions into the .version files, to keep all of the ways of specifying it in one place.

Originally posted by @vtjnash in #45691 (comment)

rm Versions.make, put all version info into standalone *.version files
update julia.spdx.json
update docs that related with Versions.make
add new stdlib/all_jlls.version to replace Versions.make in stdlib/Makefile
resolve conflicts

load `LLVM_ASSERT_JLL_VER` (Line290) before `bb-install`

inkydragon

There are some version number mismatches, but perhaps this should be fixed in a new pr.

deps/blastrampoline.version

deps/openblas.version

xref: JuliaLang#45679

deps/unwind.version

Co-authored-by: Mosè Giordano <giordano@users.noreply.github.com>

…into build-rm-Versions.make

deps/llvm-tools.version

xref: JuliaLang#42782

Co-authored-by: Mosè Giordano <giordano@users.noreply.github.com>

…into build-rm-Versions.make

inkydragon · 2022-06-18T11:55:56Z

New idea: Add a target checksum in julia/deps/Makefile, then we can check all deps at one.
Maybe in another pr.

inkydragon · 2022-06-18T16:39:49Z

deps/libssh2.version

+LIBSSH2_VER := 1.10.2
 LIBSSH2_BRANCH=libssh2-1.10.0


Version mismatch, ref: #43250

@nalimilan Any thoughts on how to address this one?

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

deps/mpfr.version

ViralBShah · 2022-06-19T20:06:17Z

stdlib/all_jlls.version

@@ -0,0 +1,28 @@
+## All `_jll` names and versions


Is it possible to do something automatic here - something like include *.version so that we don't have to update manually here in the future?

It looks like you can just use wildcards.

include foo *.mk $(bar)

Include (GNU make)

Maybe we could use one line include $(JULIAHOME)/deps/*.version to replace the whole file.

But I'd link to open a new pr for this.

stdlib/all_jlls.version

ViralBShah · 2022-06-19T21:26:42Z

This PR looks pretty good to merge. We should get it in before too many conflicts arise. I feel that any breakages that happen here can be swiftly addressed.

@inkydragon The merge conflict should be easy to address. Sorry to create some extra work for you.

xref: JuliaLang#45746

Co-authored-by: Mosè Giordano <giordano@users.noreply.github.com>

deps/objconv.version

deps/unwind.mk

stdlib/all_jlls.version

Co-authored-by: Elliot Saba <staticfloat@gmail.com>

Co-authored-by: Mosè Giordano <giordano@users.noreply.github.com>

…into build-rm-Versions.make

ref: JuliaLang#45761

ViralBShah · 2022-06-24T03:40:51Z

Should we merge?

inkydragon · 2022-06-27T08:44:47Z

@vtjnash I think this pr is ready to be merged. Is there anything else I need to do?
Or could you recommend someone to review this?

I can also split this pr into 2 or 3 smaller pr's for review if necessary.

ViralBShah · 2022-06-27T13:17:51Z

I feel this is good to merge and mostly straightforward. Let's wait a day for @vtjnash.

…ang#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: JuliaLang#42782

giordano · 2022-10-15T12:52:13Z

deps/libgit2.version

+## 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


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

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.

inkydragon added 8 commits June 16, 2022 15:09

deps: split Versions.make into standalone *.version file

ba0d45d

repo: update julia.spdx.json

3920564

deps: rm Versions.make

b33e5c2

deps: include $(LibName).version

9e14d10

deps: split unwind.version, add new llvmunwind.version

07c6f39

deps: split llvm.version into clang.version + llvm-tools.version

99a4538

stdlib: Add new makefile all_jlls.version to include all _jll names

c1c0910

Makefile: use LF for all makefiles

2c12e0f

inkydragon mentioned this pull request Jun 17, 2022

[deps/stdlib] put all version info in Versions.make #45691

Closed

3 tasks

inkydragon marked this pull request as draft June 17, 2022 08:08

This comment was marked as resolved.

Sign in to view

deps/llvm: include llvm.version

0d727d4

load `LLVM_ASSERT_JLL_VER` (Line290) before `bb-install`

inkydragon commented Jun 17, 2022

View reviewed changes

deps/blastrampoline.version Outdated Show resolved Hide resolved

deps/openblas.version Outdated Show resolved Hide resolved

This comment was marked as outdated.

Sign in to view

inkydragon marked this pull request as ready for review June 17, 2022 12:33

Merge branch 'master' into build-rm-Versions.make

bda346a

vtjnash approved these changes Jun 17, 2022

View reviewed changes

deps/llvm: adjust include sequence, include .version first

1850865

This comment was marked as resolved.

Sign in to view

inkydragon force-pushed the build-rm-Versions.make branch from 15f31d5 to 1850865 Compare June 18, 2022 09:06

inkydragon added 2 commits June 18, 2022 18:30

Merge branch 'master' into build-rm-Versions.make

741cd3a

deps/llvm: update to 14.0.2

809a97f

xref: JuliaLang#45679

giordano reviewed Jun 18, 2022

View reviewed changes

deps/unwind.version Outdated Show resolved Hide resolved

inkydragon and others added 2 commits June 18, 2022 19:05

Update deps/unwind.version

badc75d

Co-authored-by: Mosè Giordano <giordano@users.noreply.github.com>

Merge branch 'build-rm-Versions.make' of github.com:inkydragon/julia …

ba29534

…into build-rm-Versions.make

giordano reviewed Jun 18, 2022

View reviewed changes

deps/llvm-tools.version Outdated Show resolved Hide resolved

inkydragon and others added 3 commits June 18, 2022 19:51

deps/LibUnwind_jll: fix version mismatch (Project.toml and checksum)

bae11d8

xref: JuliaLang#42782

Update deps/llvm-tools.version

90b6055

Co-authored-by: Mosè Giordano <giordano@users.noreply.github.com>

Merge branch 'build-rm-Versions.make' of github.com:inkydragon/julia …

634ceca

…into build-rm-Versions.make

DilumAluthge requested a review from staticfloat June 18, 2022 16:55

inkydragon commented Jun 18, 2022

View reviewed changes

ViralBShah reviewed Jun 19, 2022

View reviewed changes

ViralBShah approved these changes Jun 19, 2022

View reviewed changes

Update OPENBLAS_VER to 0.3.20

fd42fe3

giordano reviewed Jun 19, 2022

View reviewed changes

stdlib/all_jlls.version Show resolved Hide resolved

inkydragon and others added 4 commits June 20, 2022 10:59

Merge branch 'master' into build-rm-Versions.make

2b47176

deps: merge patches for Versions.make

3e4ffb0

xref: JuliaLang#45746

Update stdlib/all_jlls.version

5051246

Co-authored-by: Mosè Giordano <giordano@users.noreply.github.com>

deps/mpfr: add comments for version mismatch

9e15c30

staticfloat approved these changes Jun 20, 2022

View reviewed changes

deps/objconv.version Outdated Show resolved Hide resolved

deps/unwind.mk Show resolved Hide resolved

giordano reviewed Jun 20, 2022

View reviewed changes

stdlib/all_jlls.version Outdated Show resolved Hide resolved

inkydragon and others added 5 commits June 21, 2022 10:00

Update deps/objconv.version

212eab6

Co-authored-by: Elliot Saba <staticfloat@gmail.com>

Update stdlib/all_jlls.version

6d01064

Co-authored-by: Mosè Giordano <giordano@users.noreply.github.com>

deps: add a TODO in all_jlls.version

9e7b058

Merge branch 'build-rm-Versions.make' of github.com:inkydragon/julia …

306eb9f

…into build-rm-Versions.make

Merge branch 'master' into build-rm-Versions.make

677e476

staticfloat approved these changes Jun 21, 2022

View reviewed changes

inkydragon added 3 commits June 22, 2022 19:06

Merge branch 'master' into build-rm-Versions.make

44a22d2

deps: apply patches from deps/Versions.make

fd69fab

ref: JuliaLang#45761

Merge branch 'master' into build-rm-Versions.make

fd1b4d0

vtjnash merged commit a8d1d36 into JuliaLang:master Jun 28, 2022

inkydragon deleted the build-rm-Versions.make branch June 28, 2022 15:15

inkydragon mentioned this pull request Jun 29, 2022

[stdlib/jll] Automatic include of all *.version makefile #45851

Merged

giordano reviewed Oct 15, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

inkydragon commented Jun 17, 2022 •

edited

Loading

This comment was marked as resolved.

inkydragon left a comment

This comment was marked as outdated.

This comment was marked as resolved.

inkydragon commented Jun 18, 2022

inkydragon Jun 18, 2022

ViralBShah Jun 19, 2022

nalimilan Jun 19, 2022

ViralBShah Jun 19, 2022 •

edited

Loading

inkydragon Jun 20, 2022 •

edited

Loading

ViralBShah Jun 21, 2022

ViralBShah commented Jun 19, 2022 •

edited

Loading

ViralBShah commented Jun 24, 2022

inkydragon commented Jun 27, 2022

ViralBShah commented Jun 27, 2022

giordano Oct 15, 2022

inkydragon Oct 15, 2022 •

edited

Loading

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

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

Conversation

inkydragon commented Jun 17, 2022 • edited Loading

This comment was marked as resolved.

inkydragon left a comment

Choose a reason for hiding this comment

This comment was marked as outdated.

This comment was marked as resolved.

inkydragon commented Jun 18, 2022

inkydragon Jun 18, 2022

Choose a reason for hiding this comment

ViralBShah Jun 19, 2022

Choose a reason for hiding this comment

nalimilan Jun 19, 2022

Choose a reason for hiding this comment

ViralBShah Jun 19, 2022 • edited Loading

Choose a reason for hiding this comment

inkydragon Jun 20, 2022 • edited Loading

Choose a reason for hiding this comment

ViralBShah Jun 21, 2022

Choose a reason for hiding this comment

ViralBShah commented Jun 19, 2022 • edited Loading

ViralBShah commented Jun 24, 2022

inkydragon commented Jun 27, 2022

ViralBShah commented Jun 27, 2022

giordano Oct 15, 2022

Choose a reason for hiding this comment

inkydragon Oct 15, 2022 • edited Loading

Choose a reason for hiding this comment

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

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

inkydragon commented Jun 17, 2022 •

edited

Loading

ViralBShah Jun 19, 2022 •

edited

Loading

inkydragon Jun 20, 2022 •

edited

Loading

ViralBShah commented Jun 19, 2022 •

edited

Loading

inkydragon Oct 15, 2022 •

edited

Loading