mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-13 16:06:59 +02:00
app-arch/xz-utils: Sync with Gentoo
It's from Gentoo commit ad4a2d8b96e0365cc95301df3f61af940cbb4ad6.
This commit is contained in:
parent
0c93cf536b
commit
e22bd50dff
@ -1,10 +1,8 @@
|
|||||||
DIST xz-5.4.7.tar.gz 2798247 BLAKE2B e02f3a62c81882c83254e1c94f002aadcd59479dbd031a4d5ea68ce3303c066c298c2709845f2d4ef436511b21d35ab66a080542ac70aaf6c0a0daf448a47d02 SHA512 82c3e5d39fbaa5dcd61b45d5db99d740d811323456a9af3b1acfccbe66b074d1650bc810ee8272a8ae0a1bcf116fc73fc09297b8acb4c6568cf912708306e8ea
|
DIST xz-5.4.7.tar.gz 2798247 BLAKE2B e02f3a62c81882c83254e1c94f002aadcd59479dbd031a4d5ea68ce3303c066c298c2709845f2d4ef436511b21d35ab66a080542ac70aaf6c0a0daf448a47d02 SHA512 82c3e5d39fbaa5dcd61b45d5db99d740d811323456a9af3b1acfccbe66b074d1650bc810ee8272a8ae0a1bcf116fc73fc09297b8acb4c6568cf912708306e8ea
|
||||||
DIST xz-5.4.7.tar.gz.sig 566 BLAKE2B 525eeeddb219c6e46ef2079af0cd28c8514969ce33b2ab61ccae59ae26289e7ddbd29dd492f88f4e4da9db750dd60ce1831a23a0275cdac39bd5b29c663d1a72 SHA512 00e9004739a168fd8a1ca4bb8b8a9de456bbef2576565722158140f341e94f461dab05c6e457f62a1613229419a978898e878007872571afdc1bb8a9582fa00a
|
DIST xz-5.4.7.tar.gz.sig 566 BLAKE2B 525eeeddb219c6e46ef2079af0cd28c8514969ce33b2ab61ccae59ae26289e7ddbd29dd492f88f4e4da9db750dd60ce1831a23a0275cdac39bd5b29c663d1a72 SHA512 00e9004739a168fd8a1ca4bb8b8a9de456bbef2576565722158140f341e94f461dab05c6e457f62a1613229419a978898e878007872571afdc1bb8a9582fa00a
|
||||||
DIST xz-5.6.2.tar.gz 2355785 BLAKE2B d2d5f9772714b5b5993ec26c313bd27dc10d88928d9d3a1c71b78f80797e376cf065dcdd0c2c7977a83b67cbe2558140c74c5df44a9408e5a72529212c2205ad SHA512 c32c32c95e3541b906e0284e66a953ace677e0ce6af2084e7b122600047bf7542c1b0fabb5909b19ff79fba6def530be674df1c675b22a47a8d57f3f0b736a82
|
|
||||||
DIST xz-5.6.2.tar.gz.sig 566 BLAKE2B 9b1f19d0449de18057eb5bd3cceaa073fc245e9a05fb19fabdac98b1d2e708b39c8070130c522b78ff75df724e207f978d8da65e2ccb1c6fa295aa892eda0d23 SHA512 f3d1055a2a6e96eec2fd5c0b733f2ab5e150bac9645f1fe9a7558ed6f34a241b4f57e17fd4504f311be26cf1e2b9b797f2e78b1b9d2db02e9cd0c1548cb6160b
|
|
||||||
DIST xz-5.6.3.tar.gz 2279396 BLAKE2B 9f09926f1ec7d72e6564f5816101512717bcb37610b551616117818d4e6a3b6c00b4ac74bf13a06cd299ff199a0561f2c05a3884a6f6b7e94951de2c1c2e6dc3 SHA512 b07b45e18615d1946e9d12157af99b54700d757832a638fccab70549574dcd7f28e69e71cc4c0b9c808959f818e79b668a5ccf108429ea0f40b6125bfd55d274
|
DIST xz-5.6.3.tar.gz 2279396 BLAKE2B 9f09926f1ec7d72e6564f5816101512717bcb37610b551616117818d4e6a3b6c00b4ac74bf13a06cd299ff199a0561f2c05a3884a6f6b7e94951de2c1c2e6dc3 SHA512 b07b45e18615d1946e9d12157af99b54700d757832a638fccab70549574dcd7f28e69e71cc4c0b9c808959f818e79b668a5ccf108429ea0f40b6125bfd55d274
|
||||||
DIST xz-5.6.3.tar.gz.sig 566 BLAKE2B b59899d9ddc3325bd0de084dac420440ccdeb5f57f3656300f235fdae997a8943c2dc44edc3b83150b78717a7bf761152f09b41035d245fa536c45b8c06dd00d SHA512 65a0eb674b804309417d736b3ec9edb9c9bf39485593d81f352ee847662f5a95b3d5084fab21451e3510d74e4e2ee8f9cf4e8615d1128b6e16d5c211481481db
|
DIST xz-5.6.3.tar.gz.sig 566 BLAKE2B b59899d9ddc3325bd0de084dac420440ccdeb5f57f3656300f235fdae997a8943c2dc44edc3b83150b78717a7bf761152f09b41035d245fa536c45b8c06dd00d SHA512 65a0eb674b804309417d736b3ec9edb9c9bf39485593d81f352ee847662f5a95b3d5084fab21451e3510d74e4e2ee8f9cf4e8615d1128b6e16d5c211481481db
|
||||||
DIST xz-5.6.4.tar.gz 2280985 BLAKE2B 3d27c143f4856589d501bc47ff5c86c1c49b1d0b8c8fd2143bcbfe86b860ca93f6a103f628e06ce5c2839ce1941cecc7552d91b1aac5c11def40fd9182d93eee SHA512 b966950eb9206e31f284c9dc3bb0a79f2fabbaf515e88c89da53d3da41ddfeebd2fc6d3d3f8fcd150c70caaaefa43dec0bce84aa183e08bf339d1aebbe041751
|
DIST xz-5.6.4.tar.gz 2280985 BLAKE2B 3d27c143f4856589d501bc47ff5c86c1c49b1d0b8c8fd2143bcbfe86b860ca93f6a103f628e06ce5c2839ce1941cecc7552d91b1aac5c11def40fd9182d93eee SHA512 b966950eb9206e31f284c9dc3bb0a79f2fabbaf515e88c89da53d3da41ddfeebd2fc6d3d3f8fcd150c70caaaefa43dec0bce84aa183e08bf339d1aebbe041751
|
||||||
DIST xz-5.6.4.tar.gz.sig 566 BLAKE2B 475b576431f573b9ce390ae2c43fc4f307f00ef523a741ec6795f182f5ff2c30f2049b1b4d2a3a7e61769bb7dc568de0f5af89661cb09341a58bbcdcdda3c877 SHA512 1ece59b7a540f6d215206ced14759aa971f192433705f8803b6ad8db0857e246145300c853cb571d8750b8152483d13736c478a7c0abb40d7ed25305d80a841c
|
DIST xz-5.6.4.tar.gz.sig 566 BLAKE2B 475b576431f573b9ce390ae2c43fc4f307f00ef523a741ec6795f182f5ff2c30f2049b1b4d2a3a7e61769bb7dc568de0f5af89661cb09341a58bbcdcdda3c877 SHA512 1ece59b7a540f6d215206ced14759aa971f192433705f8803b6ad8db0857e246145300c853cb571d8750b8152483d13736c478a7c0abb40d7ed25305d80a841c
|
||||||
DIST xz-5.7.1alpha.tar.gz 2334409 BLAKE2B 98e98ebde9175fe8b135fa59f8e8acff1b8c6278f75a3ea997ebbe9aac25cb1a6a1f1bde163af4788ca0532bc270fe5baaf6cd89ba4c81ed3e3f7a6f08e741eb SHA512 40349652f3903e1d37e1cdc0b0b6f5479db0bc5bcbdc371f34b7cf7de730b1781748e1a6cad3dcc9e721243a0bd6f1c062a5ae54e966d23ff80ae0f0c9371246
|
DIST xz-5.7.2beta.tar.gz 2568902 BLAKE2B e7474e89bb628ea1a4a906ecad19be6b2bef30f2a674f9a384d20a5f1536cd8db0486f953de828ab327cef22a50dc23786e925b266b4f7398510c06707184699 SHA512 a9f373dcbfbfa0badac78f51678c078b455fc977744b80e04ae1f1dc19b1df681adb4097a4dfe2f50c7811e8f89287ab9d3bc28c00a8b48549adfe9bbc3f00a1
|
||||||
DIST xz-5.7.1alpha.tar.gz.sig 566 BLAKE2B 33c23b3aace6856f67b927d2f5b46f60f1e96eedde6a7e2cf5085e44b96da6503a8c38d5977a1dd7b068d9cb9ae652d457e9344eb40b482979d810afeb38f888 SHA512 f3fce937be1753b94110f2cf8ea1da52905133f8a62f9b2f91f6b5c91d2400ae63e000b392a0b992cd16495227077c0f26f1e36349b048e84a6bb8d3e618fd28
|
DIST xz-5.7.2beta.tar.gz.sig 566 BLAKE2B 477e29d86a8dd76ea4eede8da223031ae36110d859afd46f18cd9fe67af6bc64cd0d80501d83c5fbd044d01b5307a69d634fe15a244096d2278a28c576628148 SHA512 cbbe79a2e00af78aeecb959fcda4dfe6d178f0a11cb9f64407b8850e586dcd50a386de41a675a9274b9be3d2122facf1377271a5fc6f9f3288e7b1f2598e5999
|
||||||
|
@ -1,203 +0,0 @@
|
|||||||
# Copyright 1999-2024 Gentoo Authors
|
|
||||||
# Distributed under the terms of the GNU General Public License v2
|
|
||||||
|
|
||||||
# Remember: we cannot leverage autotools in this ebuild in order
|
|
||||||
# to avoid circular deps with autotools
|
|
||||||
|
|
||||||
EAPI=8
|
|
||||||
|
|
||||||
inherit flag-o-matic libtool multilib multilib-minimal preserve-libs toolchain-funcs
|
|
||||||
|
|
||||||
if [[ ${PV} == 9999 ]] ; then
|
|
||||||
# Per tukaani.org, git.tukaani.org is a mirror of github and
|
|
||||||
# may be behind.
|
|
||||||
EGIT_REPO_URI="
|
|
||||||
https://github.com/tukaani-project/xz
|
|
||||||
https://git.tukaani.org/xz.git
|
|
||||||
"
|
|
||||||
inherit git-r3 autotools
|
|
||||||
|
|
||||||
# bug #272880 and bug #286068
|
|
||||||
BDEPEND="sys-devel/gettext >=dev-build/libtool-2"
|
|
||||||
else
|
|
||||||
VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/lassecollin.asc
|
|
||||||
inherit verify-sig
|
|
||||||
|
|
||||||
MY_P="${PN/-utils}-${PV/_}"
|
|
||||||
SRC_URI="
|
|
||||||
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz
|
|
||||||
https://downloads.sourceforge.net/lzmautils/${MY_P}.tar.gz
|
|
||||||
https://tukaani.org/xz/${MY_P}.tar.gz
|
|
||||||
verify-sig? (
|
|
||||||
https://github.com/tukaani-project/xz/releases/download/v${PV/_}/${MY_P}.tar.gz.sig
|
|
||||||
https://tukaani.org/xz/${MY_P}.tar.gz.sig
|
|
||||||
)
|
|
||||||
"
|
|
||||||
|
|
||||||
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
|
|
||||||
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
|
||||||
fi
|
|
||||||
|
|
||||||
S="${WORKDIR}/${MY_P}"
|
|
||||||
fi
|
|
||||||
|
|
||||||
DESCRIPTION="Utils for managing LZMA compressed files"
|
|
||||||
HOMEPAGE="https://tukaani.org/xz/"
|
|
||||||
|
|
||||||
# See top-level COPYING file as it outlines the various pieces and their licenses.
|
|
||||||
LICENSE="0BSD LGPL-2.1+ GPL-2+ doc? ( CC-BY-SA-4.0 )"
|
|
||||||
SLOT="0"
|
|
||||||
IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs"
|
|
||||||
|
|
||||||
if [[ ${PV} != 9999 ]] ; then
|
|
||||||
BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20240529 )"
|
|
||||||
fi
|
|
||||||
|
|
||||||
src_prepare() {
|
|
||||||
default
|
|
||||||
|
|
||||||
if [[ ${PV} == 9999 ]] ; then
|
|
||||||
eautopoint
|
|
||||||
eautoreconf
|
|
||||||
else
|
|
||||||
# Allow building shared libs on Solaris/x64
|
|
||||||
elibtoolize
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_configure() {
|
|
||||||
# Workaround for bug #934370 (libtool-2.5.0), drop when dist tarball
|
|
||||||
# uses newer libtool with the fix.
|
|
||||||
export ac_cv_prog_ac_ct_FILECMD='file' FILECMD='file'
|
|
||||||
|
|
||||||
local myconf=(
|
|
||||||
--enable-threads
|
|
||||||
$(multilib_native_use_enable doc)
|
|
||||||
$(use_enable nls)
|
|
||||||
$(use_enable static-libs static)
|
|
||||||
$(use_enable cpu_flags_arm_crc32 arm64-crc32)
|
|
||||||
)
|
|
||||||
|
|
||||||
if ! multilib_is_native_abi ; then
|
|
||||||
myconf+=(
|
|
||||||
--disable-{xz,xzdec,lzmadec,lzmainfo,lzma-links,scripts}
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
|
|
||||||
if ! use extra-filters ; then
|
|
||||||
myconf+=(
|
|
||||||
# LZMA1 + LZMA2 for standard .lzma & .xz files
|
|
||||||
--enable-encoders=lzma1,lzma2
|
|
||||||
--enable-decoders=lzma1,lzma2
|
|
||||||
|
|
||||||
# those are used by default, depending on preset
|
|
||||||
--enable-match-finders=hc3,hc4,bt4
|
|
||||||
|
|
||||||
# CRC64 is used by default, though some (old?) files use CRC32
|
|
||||||
--enable-checks=crc32,crc64
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ${CHOST} == *-solaris* ]] ; then
|
|
||||||
export gl_cv_posix_shell="${EPREFIX}"/bin/sh
|
|
||||||
|
|
||||||
# Undo Solaris-based defaults pointing to /usr/xpg5/bin
|
|
||||||
myconf+=( --disable-path-for-script )
|
|
||||||
fi
|
|
||||||
|
|
||||||
ECONF_SOURCE="${S}" econf "${myconf[@]}"
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_compile() {
|
|
||||||
# -fprofile-partial-training because upstream note the test suite isn't super comprehensive
|
|
||||||
# TODO: revisit that now we have the tar/xz loop below?
|
|
||||||
# See https://documentation.suse.com/sbp/all/html/SBP-GCC-10/index.html#sec-gcc10-pgo
|
|
||||||
local pgo_generate_flags=$(usev pgo "-fprofile-update=atomic -fprofile-dir=${T}/${ABI}-pgo -fprofile-generate=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)")
|
|
||||||
local pgo_use_flags=$(usev pgo "-fprofile-use=${T}/${ABI}-pgo -fprofile-dir=${T}/${ABI}-pgo $(test-flags-CC -fprofile-partial-training)")
|
|
||||||
|
|
||||||
emake CFLAGS="${CFLAGS} ${pgo_generate_flags}"
|
|
||||||
|
|
||||||
if use pgo ; then
|
|
||||||
emake CFLAGS="${CFLAGS} ${pgo_generate_flags}" -k check
|
|
||||||
|
|
||||||
local tar_pgo_args=()
|
|
||||||
|
|
||||||
if has_version -b "app-alternatives/tar[gnu]" ; then
|
|
||||||
tar_pgo_args+=(
|
|
||||||
--mtime=@2718281828
|
|
||||||
--sort=name
|
|
||||||
)
|
|
||||||
fi
|
|
||||||
|
|
||||||
if multilib_is_native_abi ; then
|
|
||||||
(
|
|
||||||
shopt -s globstar
|
|
||||||
|
|
||||||
tar \
|
|
||||||
"${tar_pgo_args[@]}" \
|
|
||||||
-cf xz-pgo-test-01.tar \
|
|
||||||
{"${S}","${BUILD_DIR}"}/**/*.[cho] \
|
|
||||||
{"${S}","${BUILD_DIR}"}/**/.libs/* \
|
|
||||||
{"${S}","${BUILD_DIR}"}/**/**.txt \
|
|
||||||
{"${S}","${BUILD_DIR}"}/tests/files
|
|
||||||
|
|
||||||
stat --printf="xz-pgo-test-01.tar.tar size: %s\n" xz-pgo-test-01.tar || die
|
|
||||||
md5sum xz-pgo-test-01.tar || die
|
|
||||||
)
|
|
||||||
|
|
||||||
local test_variants=(
|
|
||||||
# Borrowed from ALT Linux
|
|
||||||
# https://packages.altlinux.org/en/sisyphus/srpms/xz/specfiles/#line-80
|
|
||||||
'-0 -C none'
|
|
||||||
'-2 -C crc32'
|
|
||||||
"$(usev extra-filters '-6 --arm --lzma2 -C crc64')"
|
|
||||||
"$(usev extra-filters '-6 --x86 --lzma2=lc=4 -C sha256')"
|
|
||||||
'-7e --format=lzma'
|
|
||||||
|
|
||||||
# Our own variants
|
|
||||||
''
|
|
||||||
'-9e'
|
|
||||||
"$(usev extra-filters '--x86 --lzma2=preset=9e')"
|
|
||||||
)
|
|
||||||
local test_variant
|
|
||||||
for test_variant in "${test_variants[@]}" ; do
|
|
||||||
"${BUILD_DIR}"/src/xz/xz -c ${test_variant} xz-pgo-test-01.tar | "${BUILD_DIR}"/src/xz/xz -c -d - > /dev/null
|
|
||||||
assert "Testing '${test_variant}' variant failed"
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
|
|
||||||
if tc-is-clang; then
|
|
||||||
llvm-profdata merge "${T}"/${ABI}-pgo --output="${T}"/${ABI}-pgo/default.profdata || die
|
|
||||||
fi
|
|
||||||
|
|
||||||
emake clean
|
|
||||||
emake CFLAGS="${CFLAGS} ${pgo_use_flags}"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_install() {
|
|
||||||
default
|
|
||||||
|
|
||||||
# bug #934370 and bug #450436 (and bug #934515)
|
|
||||||
if ! tc-is-static-only && [[ ! -f "${ED}/usr/$(get_libdir)/liblzma$(get_libname)" ]] ; then
|
|
||||||
eerror "Sanity check for liblzma$(get_libname) failed."
|
|
||||||
eerror "Shared library wasn't built, possible libtool bug"
|
|
||||||
[[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && die "liblzma$(get_libname) not found in build, aborting"
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
multilib_src_install_all() {
|
|
||||||
find "${ED}" -type f -name '*.la' -delete || die
|
|
||||||
|
|
||||||
if use doc ; then
|
|
||||||
rm "${ED}"/usr/share/doc/${PF}/COPYING* || die
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_preinst() {
|
|
||||||
preserve_old_lib /usr/$(get_libdir)/liblzma$(get_libname 0)
|
|
||||||
}
|
|
||||||
|
|
||||||
pkg_postinst() {
|
|
||||||
preserve_old_lib_notify /usr/$(get_libdir)/liblzma$(get_libname 0)
|
|
||||||
}
|
|
@ -35,7 +35,7 @@ else
|
|||||||
"
|
"
|
||||||
|
|
||||||
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
|
if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
|
||||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
S="${WORKDIR}/${MY_P}"
|
S="${WORKDIR}/${MY_P}"
|
||||||
|
@ -50,7 +50,7 @@ SLOT="0"
|
|||||||
IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs"
|
IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs"
|
||||||
|
|
||||||
if [[ ${PV} != 9999 ]] ; then
|
if [[ ${PV} != 9999 ]] ; then
|
||||||
BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20240529 )"
|
BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20250313 )"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
src_prepare() {
|
src_prepare() {
|
@ -50,7 +50,7 @@ SLOT="0"
|
|||||||
IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs"
|
IUSE="cpu_flags_arm_crc32 doc +extra-filters pgo nls static-libs"
|
||||||
|
|
||||||
if [[ ${PV} != 9999 ]] ; then
|
if [[ ${PV} != 9999 ]] ; then
|
||||||
BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20240529 )"
|
BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-lassecollin-20250313 )"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
src_prepare() {
|
src_prepare() {
|
||||||
|
Loading…
Reference in New Issue
Block a user