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

fix xxh64 related build #5937

Merged
merged 7 commits into from
Jan 26, 2022

Conversation

ThomasWaldmann
Copy link
Member

@ThomasWaldmann ThomasWaldmann commented Jul 20, 2021

@LocutusOfBorg this is inspired by your debian patch.

https://salsa.debian.org/debian/borgbackup/-/blob/master/debian/patches/bundled-xxhash.patch

changes:

  • the ".../xxh64" part of the path was missing in your patch.
  • xxh64 belongs to checksums module (not crypto)
  • getting it to compile (xxh64, zstd with bundled code or with system lib) was a bit of a pain, but I hope it works now

also, i gave xxh64 0.8.1 a try and it worked, so i updated the bundled code.

@codecov-commenter
Copy link

codecov-commenter commented Jan 22, 2022

Codecov Report

Merging #5937 (7b3859e) into 1.1-maint (e41d8e8) will decrease coverage by 0.02%.
The diff coverage is n/a.

❗ Current head 7b3859e differs from pull request most recent head 1e88a85. Consider uploading reports for the commit 1e88a85 to get more accurate results
Impacted file tree graph

@@              Coverage Diff              @@
##           1.1-maint    #5937      +/-   ##
=============================================
- Coverage      80.00%   79.98%   -0.03%     
=============================================
  Files             27       27              
  Lines          10479    10482       +3     
  Branches        2146     2146              
=============================================
  Hits            8384     8384              
- Misses          1575     1579       +4     
+ Partials         520      519       -1     
Impacted Files Coverage Δ
src/borg/helpers.py 87.69% <0.00%> (-0.25%) ⬇️
src/borg/cache.py 85.33% <0.00%> (-0.13%) ⬇️
src/borg/archiver.py 81.42% <0.00%> (+0.07%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update e41d8e8...1e88a85. Read the comment docs.

@ThomasWaldmann ThomasWaldmann force-pushed the fix-xxh-build-1.1 branch 7 times, most recently from 7b3859e to 1e88a85 Compare January 23, 2022 01:12
@ThomasWaldmann
Copy link
Member Author

@LocutusOfBorg please review!

@ThomasWaldmann ThomasWaldmann added this to the 1.1.18 milestone Jan 23, 2022
@ThomasWaldmann
Copy link
Member Author

This needs some testing for the "system lib" as well as for the "use bundled code" case, see upper part of setup.py.

@LocutusOfBorg
Copy link
Contributor

Test cases performed:

  • 1.1.17 + this patch, no xxhash installed on the system (build OK)
  • 1.1.17 + this patch, xxhash 0.8.1 installed on the system (build OK)
    thanks a lot for fixing this issue!

@ThomasWaldmann
Copy link
Member Author

@LocutusOfBorg thanks for testing, will merge after test CI has completed.

@ThomasWaldmann ThomasWaldmann merged commit 70ba251 into borgbackup:1.1-maint Jan 26, 2022
@ThomasWaldmann ThomasWaldmann deleted the fix-xxh-build-1.1 branch January 26, 2022 16:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants