Skip to content

[core] Make lz4 a builtin obtained from the web and remove the vendored code#21581

Merged
dpiparo merged 2 commits intoroot-project:masterfrom
dpiparo:builtin_lz4
Mar 13, 2026
Merged

[core] Make lz4 a builtin obtained from the web and remove the vendored code#21581
dpiparo merged 2 commits intoroot-project:masterfrom
dpiparo:builtin_lz4

Conversation

@dpiparo
Copy link
Member

@dpiparo dpiparo commented Mar 12, 2026

This PR does what was done for lzma by #21571.

LZ4 is now fetched in its version 1.10.0, from LCG, and treated as lzma (and libpng, libgif and libjpeg, and others)

@dpiparo dpiparo requested review from hageboeck and jblomer March 12, 2026 10:26
@dpiparo dpiparo self-assigned this Mar 12, 2026
@dpiparo dpiparo requested a review from bellenot as a code owner March 12, 2026 10:26
@dpiparo dpiparo changed the title [core] Make lzma a builtin obtained from the web and remove the vendored code [core] Make lz4 a builtin obtained from the web and remove the vendored code Mar 12, 2026
Copy link
Member

@hageboeck hageboeck left a comment

Choose a reason for hiding this comment

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

  • Typo in the commit message: lcg --> lz4
  • Shouldn't some source files be removed from the repo if you go to a downloaded builtin?


set(LZ4_VERSION ${ROOT_LZ4_VERSION} CACHE INTERNAL "" FORCE) # used in roottest

set(ROOT_LZ4_PREFIX ${CMAKE_BINARY_DIR}/builtins/LZ4-prefix)
Copy link
Member

Choose a reason for hiding this comment

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

Why don't we call this builtins/LZ4, actually? I was always wondering why people were attaching -prefix.

Copy link
Member Author

Choose a reason for hiding this comment

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

or we put it inside builtin/lz4/ ?

Copy link
Member

Choose a reason for hiding this comment

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

That's what I meant! (builtins/lz4/) 👍

@github-actions
Copy link

github-actions bot commented Mar 12, 2026

Test Results

    22 files      22 suites   3d 2h 36m 58s ⏱️
 3 810 tests  3 809 ✅ 1 💤 0 ❌
75 841 runs  75 832 ✅ 9 💤 0 ❌

Results for commit 90f4b8e.

♻️ This comment has been updated with latest results.

Copy link
Contributor

@jblomer jblomer left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@hageboeck hageboeck left a comment

Choose a reason for hiding this comment

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

It looks mostly OK, but there were two items to be addressed (both more cosmetics than functional changes, but you seemed to agree to at least the second):

  1. The first commit states that it replaces "lcg" instead of lz4. If you are rebasing anyway (for item 2), this could be fixed.
  2. Why not put the builtin in builtins/lz4? You kind of suggested this yourself.


set(LZ4_VERSION ${ROOT_LZ4_VERSION} CACHE INTERNAL "" FORCE) # used in roottest

set(ROOT_LZ4_PREFIX ${CMAKE_BINARY_DIR}/builtins/LZ4-prefix)
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
set(ROOT_LZ4_PREFIX ${CMAKE_BINARY_DIR}/builtins/LZ4-prefix)
set(ROOT_LZ4_PREFIX ${CMAKE_BINARY_DIR}/builtins/lz4)

@dpiparo dpiparo added the skip ci Skip the full builds on the actions runners label Mar 13, 2026
@dpiparo dpiparo merged commit 0e2647a into root-project:master Mar 13, 2026
10 checks passed
@dpiparo dpiparo deleted the builtin_lz4 branch March 13, 2026 13:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

skip ci Skip the full builds on the actions runners

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants