upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-04-23 15:19:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix xxh64 module confusion

Browse source 
the xxh64 lib is used by borg's "checksums" module, not by borg's "crypto" module.

inspired by LocutusOfBorg's debian packaging patch.
This commit is contained in:
Thomas Waldmann 2021-07-20 23:28:42 +02:00
parent 91e46aa3af
commit 0f477282c3
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
setup.py
View file

@ -811,10 +811,11 @@ if not on_rtd:
crypto_ext_kwargs = setup_b2.b2_ext_kwargs(bundled_path='src/borg/algorithms/blake2',
system_prefix=libb2_prefix, system=libb2_system,
**crypto_ext_kwargs)
crypto_ext_kwargs = setup_xxhash.xxhash_ext_kwargs(bundled_path='src/borg/algorithms/xxh64',
checksums_ext_kwargs = dict(sources=[checksums_source], include_dirs=include_dirs, library_dirs=library_dirs,
define_macros=define_macros)
checksums_ext_kwargs = setup_xxhash.xxhash_ext_kwargs(bundled_path='src/borg/algorithms/xxh64',
system_prefix=libxxhash_prefix, system=libxxhash_system,
**crypto_ext_kwargs)
**checksums_ext_kwargs)
msgpack_macros = [] # setup.py of msgpack 0.5.6 defines __LITTLE_ENDIAN__ / __BIG_ENDIAN__ - which
# leads to troubles when trying cross-platform builds, see borg issue #6105.
@ -844,7 +845,7 @@ if not on_rtd:
Extension('borg.hashindex', [hashindex_source]),
Extension('borg.item', [item_source]),
Extension('borg.chunker', [chunker_source]),
Extension('borg.algorithms.checksums', [checksums_source]),
Extension('borg.algorithms.checksums', **checksums_ext_kwargs),
]
if not sys.platform.startswith(('win32', )):
ext_modules.append(Extension('borg.platform.posix', [platform_posix_source]))