commit: 07da257cfc80509c50104560b1e1508b9e585b98 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sat Mar 14 23:18:55 2020 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sat Mar 14 23:21:55 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=07da257c
compression_probe: omit zstd --long=31 on 32-bit arch (bug 710444) Omit the zstd --long=31 argument for decompression on 32-bit architectures, since the latest version of zstd will otherwise abort with an error on 32-bit architectures. Bug: https://bugs.gentoo.org/710444 Bug: https://bugs.gentoo.org/634980 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> lib/portage/util/compression_probe.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/portage/util/compression_probe.py b/lib/portage/util/compression_probe.py index 90880b1cd..7d595670b 100644 --- a/lib/portage/util/compression_probe.py +++ b/lib/portage/util/compression_probe.py @@ -1,6 +1,7 @@ -# Copyright 2015 Gentoo Foundation +# Copyright 2015-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 +import ctypes import errno import re import sys @@ -45,7 +46,12 @@ _compressors = { }, "zstd": { "compress": "zstd ${BINPKG_COMPRESS_FLAGS}", - "decompress": "zstd -d --long=31", + # If the compression windowLog was larger than the default of 27, + # then --long=windowLog needs to be passed to the decompressor. + # Therefore, pass a larger --long=31 value to the decompressor + # if the current architecture can support it, which is true when + # sizeof(long) is at least 8 bytes. + "decompress": "zstd -d" + (" --long=31" if ctypes.sizeof(ctypes.c_long) >= 8 else ""), "package": "app-arch/zstd", }, }
