From 3482c9ca78b6b41a36677d56cd71e12718446d82 Mon Sep 17 00:00:00 2001 From: Flatcar Buildbot Date: Mon, 11 Mar 2024 07:10:58 +0000 Subject: [PATCH] app-arch/xz-utils: Sync with Gentoo It's from Gentoo commit 5b2cdd1c7d1743ea2937248ccc02bca9517a5771. --- .../portage-stable/app-arch/xz-utils/Manifest | 2 ++ .../xz-utils-5.6.0-ifunc-crc-workaround.patch | 27 +++++++++++++++++++ .../xz-utils/xz-utils-5.6.0-r1.ebuild | 1 + ...ils-5.6.0.ebuild => xz-utils-5.6.1.ebuild} | 0 4 files changed, 30 insertions(+) create mode 100644 sdk_container/src/third_party/portage-stable/app-arch/xz-utils/files/xz-utils-5.6.0-ifunc-crc-workaround.patch rename sdk_container/src/third_party/portage-stable/app-arch/xz-utils/{xz-utils-5.6.0.ebuild => xz-utils-5.6.1.ebuild} (100%) diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest index 360a442874..2638e4d919 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest +++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/Manifest @@ -4,3 +4,5 @@ DIST xz-5.4.6.tar.gz 2889306 BLAKE2B f0bbd33ea7cd64d475c3501f6e76080c8c0080e377f DIST xz-5.4.6.tar.gz.sig 566 BLAKE2B 808f1b5e2a17729f36a05ba88a9c00210cda2afa02923e6f289d13dc2a48f7674cafec6e25660e142d67f01dd941c7390cee2757b054df3a3193dde0791363a1 SHA512 d5e32b944e7492a32c40f675d918796e077f63490a23c6fce5c4d6d1eebc443f129d27a2e888913c5a36c3ffdac75b9c96c1749402283445e0ba9ff72b965741 DIST xz-5.6.0.tar.gz 3036813 BLAKE2B 7b7ed5da5711fee6e53af1c72a6f4aff569d7cf986bca8cd3f3104cbb73342e81306295903a8660476d228344eb17d08e2a005230c06ac7e3d9e27bbaba0e075 SHA512 1ef3cd3607818314e55b28c20263a9088d4b6e5362a45fbd37c17e799e26b4a7579928b99925ffe71e7804b0db2f65936f66a825bac9b23b7b0664f902925de8 DIST xz-5.6.0.tar.gz.sig 566 BLAKE2B 6c073c620b03751fcb40f47612acf96bee67f9dd5c38aa8ccd1f140cf3183ba009b60496fe319c14d9a32bd6cc6563f142d1716d9ae1e0554f77114dc9fc8f21 SHA512 2800c3f440b6b17b61c418e12945f136535cc5a59069be2ee0de37e312e9ad16a29338152990eeb22ebe6cc3513679bdc40336cfa089a279d3b3476ac9d13ed0 +DIST xz-5.6.1.tar.gz 3045434 BLAKE2B b3fc3140c9655e812a03800a5ed8ac709aaafaee2ce5d3a62defdd085e643fa639de44beb64833160f4eb12829ad25b96d9f50a8c3d56d79cd5bbef71b9009b2 SHA512 8af100eb83288f032e4813be2bf8de7d733c8761f77f078776c1391709241ad8fe3192d107664786e2543677915c5eeb3fe7add5c53b48b50c10a9de7c9f4fda +DIST xz-5.6.1.tar.gz.sig 566 BLAKE2B d515e60da078e6cb79a2c7a9daa3c8326487d7e8c0f1398d6059c53493232c3a3c21174dab5904833d0938a59fdb02f86aab05767d8cf02f8ee53981d3767fae SHA512 73f50ff5ce7f9d0a3bed1bc7d9e26de2217915517d2057f0c7102374eb20de1bb8b02a2f78680aae80b55913b2ede5141a118c51a2f565c6eba6ae8406474938 diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/files/xz-utils-5.6.0-ifunc-crc-workaround.patch b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/files/xz-utils-5.6.0-ifunc-crc-workaround.patch new file mode 100644 index 0000000000..e793aac56a --- /dev/null +++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/files/xz-utils-5.6.0-ifunc-crc-workaround.patch @@ -0,0 +1,27 @@ +https://bugs.gentoo.org/925415 +https://gcc.gnu.org/PR114115 + +Workaround a build failure with USE=pgo by disabling instrumentation of the +crc{32,64} IFUNC resolvers. +--- a/src/liblzma/check/crc32_fast.c ++++ b/src/liblzma/check/crc32_fast.c +@@ -135,7 +135,7 @@ typedef uint32_t (*crc32_func_type)( + // This resolver is shared between all three dispatch methods. It serves as + // the ifunc resolver if ifunc is supported, otherwise it is called as a + // regular function by the constructor or first call resolution methods. +-static crc32_func_type ++static __attribute__((no_profile_instrument_function)) crc32_func_type + crc32_resolve(void) + { + return is_arch_extension_supported() +--- a/src/liblzma/check/crc64_fast.c ++++ b/src/liblzma/check/crc64_fast.c +@@ -98,7 +98,7 @@ typedef uint64_t (*crc64_func_type)( + # pragma GCC diagnostic ignored "-Wunused-function" + #endif + +-static crc64_func_type ++static __attribute__((no_profile_instrument_function)) crc64_func_type + crc64_resolve(void) + { + return is_arch_extension_supported() diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild index 26708cb6ae..7260487c61 100644 --- a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.6.0-r1.ebuild @@ -55,6 +55,7 @@ fi PATCHES=( "${FILESDIR}"/${P}-logging-verbosity-threads-auto.patch + "${FILESDIR}"/${PN}-5.6.0-ifunc-crc-workaround.patch ) src_prepare() { diff --git a/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.6.0.ebuild b/sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.6.1.ebuild similarity index 100% rename from sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.6.0.ebuild rename to sdk_container/src/third_party/portage-stable/app-arch/xz-utils/xz-utils-5.6.1.ebuild