commit: b32d4074ece2347716ddb5df32f906df104f20ca Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Jan 10 13:23:16 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Jan 10 13:23:16 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b32d4074
dev-util/strace: add 5.16 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-util/strace/Manifest | 1 + .../{strace-9999.ebuild => strace-5.16.ebuild} | 27 +++++++++++----------- dev-util/strace/strace-9999.ebuild | 27 +++++++++++----------- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest index db1520c652d2..6c34dba08db6 100644 --- a/dev-util/strace/Manifest +++ b/dev-util/strace/Manifest @@ -1,3 +1,4 @@ DIST strace-5.12.tar.xz 2009060 BLAKE2B 9a7a07e5d2d38c8b456f54d0e1d7c776066b20327fa08d562e426a7096f708dffa00f0c2121683fa71f7029db958d450c5a6abf5ae5970dc02732f5aa7cef591 SHA512 289cf82da4c69270458953b45d09c8eb05a6624898d3ac493c3ec293cd5ad07205084ad0af021dab2be9c0dc53f0301816113a746d96c78780b79231a185e7c9 DIST strace-5.14.tar.xz 2067020 BLAKE2B 479ecf5e66e26e722d108c905130f482c411857db234ac013bf3568905c0f7b896f001ba6da2cabccd0a987c7802aebec9c6298decb691de125e8154c28e1c6f SHA512 3e147521773d900167809db9feeb148e8ba116f90dd634311941ea335eb7bd8b73ab9e641bd2dcfe899ab41c19a841e203dc771ec3000ae01452d22ecdc43c5a DIST strace-5.15.tar.xz 2248664 BLAKE2B fff08e49552ad1208b658f91e37c540cc7315ac255aba2e69db5bfeb942114b865f1114a45663481f1ab967db45d187bdbcf70ffe80449169df0c37ff82a1a94 SHA512 67251792ad0fb7f44013c3ae5e5b757106223c9d123d349e31de7565e0f2bfdc6bbd46a9c269e58508bd288ee70f104f8e2185f2203bd91431c5c776db0d9384 +DIST strace-5.16.tar.xz 2265944 BLAKE2B 0c0fb133e8642c30a8c706ba23c2d0976ff4e6662a1d07c6cd3cb70aaa980020d54220fe0baddcb70e3c3eb24bc2a8733e4b52ef4e99da5c11ed852c192a5c21 SHA512 db5993ece5600d928a42dedd2d5c8efec5b9195becb5fe6913f58f4e2f486d80f1700d63d1e67b591d4e6b13d19c4fcc0c52a4d0fa57c5a5a2ea73c4edd0f817 diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-5.16.ebuild similarity index 90% copy from dev-util/strace/strace-9999.ebuild copy to dev-util/strace/strace-5.16.ebuild index 035be39c8354..a0531b88dede 100644 --- a/dev-util/strace/strace-9999.ebuild +++ b/dev-util/strace/strace-5.16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,12 +19,9 @@ HOMEPAGE="https://strace.io/" LICENSE="BSD" SLOT="0" IUSE="aio perl selinux static unwind elfutils" - REQUIRED_USE="?? ( unwind elfutils )" -BDEPEND=" - virtual/pkgconfig -" +BDEPEND="virtual/pkgconfig" LIB_DEPEND=" unwind? ( sys-libs/libunwind[static-libs(+)] ) elfutils? ( dev-libs/elfutils[static-libs(+)] ) @@ -58,12 +55,7 @@ src_prepare() { [[ ! -e CREDITS ]] && cp CREDITS{.in,} fi - filter-lfs-flags # configure handles this sanely - - export ac_cv_header_libaio_h=$(usex aio) - use elibc_musl && export ac_cv_header_stdc=no - - # Stub out the -k test since it's known to be flaky. #545812 + # Stub out the -k test since it's known to be flaky. bug #545812 sed -i '1iexit 77' tests*/strace-k.test || die } @@ -76,10 +68,17 @@ src_configure() { export "${v}_FOR_BUILD=${!bv}" done - # Don't require mpers support on non-multilib systems. #649560 + filter-lfs-flags # configure handles this sanely + + export ac_cv_header_libaio_h=$(usex aio) + use elibc_musl && export ac_cv_header_stdc=no + local myeconfargs=( --disable-gcc-Werror + + # Don't require mpers support on non-multilib systems. #649560 --enable-mpers=check + $(use_enable static) $(use_with unwind libunwind) $(use_with elfutils libdw) @@ -90,7 +89,8 @@ src_configure() { src_test() { if has usersandbox ${FEATURES} ; then - ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044 + # bug #643044 + ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." return 0 fi @@ -99,6 +99,7 @@ src_test() { src_install() { default + if use perl ; then exeinto /usr/bin doexe src/strace-graph diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild index 035be39c8354..a0531b88dede 100644 --- a/dev-util/strace/strace-9999.ebuild +++ b/dev-util/strace/strace-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -19,12 +19,9 @@ HOMEPAGE="https://strace.io/" LICENSE="BSD" SLOT="0" IUSE="aio perl selinux static unwind elfutils" - REQUIRED_USE="?? ( unwind elfutils )" -BDEPEND=" - virtual/pkgconfig -" +BDEPEND="virtual/pkgconfig" LIB_DEPEND=" unwind? ( sys-libs/libunwind[static-libs(+)] ) elfutils? ( dev-libs/elfutils[static-libs(+)] ) @@ -58,12 +55,7 @@ src_prepare() { [[ ! -e CREDITS ]] && cp CREDITS{.in,} fi - filter-lfs-flags # configure handles this sanely - - export ac_cv_header_libaio_h=$(usex aio) - use elibc_musl && export ac_cv_header_stdc=no - - # Stub out the -k test since it's known to be flaky. #545812 + # Stub out the -k test since it's known to be flaky. bug #545812 sed -i '1iexit 77' tests*/strace-k.test || die } @@ -76,10 +68,17 @@ src_configure() { export "${v}_FOR_BUILD=${!bv}" done - # Don't require mpers support on non-multilib systems. #649560 + filter-lfs-flags # configure handles this sanely + + export ac_cv_header_libaio_h=$(usex aio) + use elibc_musl && export ac_cv_header_stdc=no + local myeconfargs=( --disable-gcc-Werror + + # Don't require mpers support on non-multilib systems. #649560 --enable-mpers=check + $(use_enable static) $(use_with unwind libunwind) $(use_with elfutils libdw) @@ -90,7 +89,8 @@ src_configure() { src_test() { if has usersandbox ${FEATURES} ; then - ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044 + # bug #643044 + ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." return 0 fi @@ -99,6 +99,7 @@ src_test() { src_install() { default + if use perl ; then exeinto /usr/bin doexe src/strace-graph