From e23cdda4dbb0c83b9e682ab5e916085a35203da5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 23 Jun 2018 07:00:28 +0100 Subject: gentoo resync : 23.06.2018 --- dev-util/strace/Manifest | 6 +-- dev-util/strace/metadata.xml | 3 ++ dev-util/strace/strace-4.23-r1.ebuild | 91 +++++++++++++++++++++++++++++++++++ dev-util/strace/strace-4.23.ebuild | 85 -------------------------------- dev-util/strace/strace-9999.ebuild | 14 ++++-- 5 files changed, 107 insertions(+), 92 deletions(-) create mode 100644 dev-util/strace/strace-4.23-r1.ebuild delete mode 100644 dev-util/strace/strace-4.23.ebuild (limited to 'dev-util/strace') diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest index 9175a7f33e4c..f7bfe8adf85c 100644 --- a/dev-util/strace/Manifest +++ b/dev-util/strace/Manifest @@ -3,6 +3,6 @@ DIST strace-4.22.tar.xz 1232884 BLAKE2B 4053d1923ad1f942c3887be1716b400e426b318e DIST strace-4.23.tar.xz 1379128 BLAKE2B e1b680774172ba65190acc201a00f36ff608eb5a8239f8a6665b9f0eebfb7715eb3469d45c2333e4fac9a498ad3b448b1f39716b92cab91b035bc1e4125382eb SHA512 b54df972dc86e27668784ea4619e8c55230816b249e0a7fcca99a37b7f9ec37710742aca08c9e39b508522accb654a83c98207bab9ccac1197bb8e73e51ab116 EBUILD strace-4.20.ebuild 1938 BLAKE2B c5ac6fcf26c6d6543fb58624114f3e034d32df958b1a98a57abcdb1a07d2a994c5c3e8794b3f43ab4862605bc0190d2717abe57599333dcd7610a5dd2721d5be SHA512 d6d66f647dde209d9677016bcc231f2edfcc0cdf83875b2df1c063e4b3a7921783e522fd5708655de97127fb17e2ddb877acefbececae6348bffecfdbc7c3b8f EBUILD strace-4.22.ebuild 2146 BLAKE2B 8757643432214c86a8fef908b4cfc5b39789b79909ab988f9abe270d50e8714f2fe7012ee98742b2bca45461a46dbedffa8d1bb4a010a0b3174d2324663c7837 SHA512 127424395cf4abf513b07c7bc93e5310e1bf410417c4898889120e65ce97b67495ce00cce856f3be421ab3720cc115fdeef7c9effa63a2ab2fb94b19b123fe1e -EBUILD strace-4.23.ebuild 2146 BLAKE2B 8757643432214c86a8fef908b4cfc5b39789b79909ab988f9abe270d50e8714f2fe7012ee98742b2bca45461a46dbedffa8d1bb4a010a0b3174d2324663c7837 SHA512 127424395cf4abf513b07c7bc93e5310e1bf410417c4898889120e65ce97b67495ce00cce856f3be421ab3720cc115fdeef7c9effa63a2ab2fb94b19b123fe1e -EBUILD strace-9999.ebuild 2150 BLAKE2B c9f5b515169763de2bbdc32ee6bb875391839a474d333977ae1f5022b380a09b232d79897f42c2f2e6e8404c643096bb733ec3ad1391dc80bccfd5e1b322f0f7 SHA512 ed67dd4e6dd1c35267ef6472cae76eabbb46cfa83ee674068d62fdf0c80f43cb3d6841ee22771f1eb832c147b621a2bb4f2f056ac9c072977b9f4ac026689650 -MISC metadata.xml 593 BLAKE2B 8ee093aa497166817f6dc6086494cd01ea3a232d8d62fe36228cfb79ff8e5c5cc10a7880a6b2f3559cc2d2f190607d83228acacc77a44a0831202418dba64c44 SHA512 67300cfcaba830a47e49cd327bf2d8490b084b016a321fd6e19e52d8dc28968395b3ffc114675a7d4dc723a9ddd7b57c3ede10207a226d60a2225f88aceb59e4 +EBUILD strace-4.23-r1.ebuild 2277 BLAKE2B 0d14908ceda437cf5fc4c2883fb343fcddfb7191c729f72ce99d5b2f4eb41a18c55aadefc6f72510dd3992d6d7efbba6547b2dbc59037fdd6d40a681aa2a9b3a SHA512 917bb1f3c8c015f768d32899a724c5dda2a23d05c8de5c38cfdcc452c3b1b58aed5f7d8bbbf76834e419b23727b4d3b65c6e5fa7b6ea1c1c1537565a5b867296 +EBUILD strace-9999.ebuild 2283 BLAKE2B cf962151854597584f0fae1b649379c2ae6b7f448acc11042c56750ce401670f32ade92d142a2124c69a027d8147b8a5610877c5e3928826fec66447329a5b8f SHA512 0d200822ace7b03abbee2b03d2c997c129877400eea8828c4bc27d22e6b2131be04e5ae822241e633410059c531c67b5fff2bb8232d8a08a5585a40dea0e243c +MISC metadata.xml 705 BLAKE2B 5bbeedc586ec794a2839988f3691780c8b9d00b3279423216d57621e71c562357d4df7df3b359408779ccc0856852f7183c62c2c269c77bfb466b2d456414ad3 SHA512 b0d51447db9f1c34bb31bd519a27082d9e94d14f5ba8d19d9a9a90472f8b27a084f79e348520c92bffc2dfc408f5f45d35df2de94d13f8cf3242e042b66ea048 diff --git a/dev-util/strace/metadata.xml b/dev-util/strace/metadata.xml index 869980f0195f..ed202ff2ec68 100644 --- a/dev-util/strace/metadata.xml +++ b/dev-util/strace/metadata.xml @@ -12,6 +12,9 @@ Enable stack backtraces (-k flag) via sys-libs/libunwind + + Enable stack backtraces (-k flag) via dev-libs/elfutils + strace diff --git a/dev-util/strace/strace-4.23-r1.ebuild b/dev-util/strace/strace-4.23-r1.ebuild new file mode 100644 index 000000000000..a16ee1f785c0 --- /dev/null +++ b/dev-util/strace/strace-4.23-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic toolchain-funcs + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/strace/strace.git" + inherit git-r3 autotools +else + SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" +fi + +DESCRIPTION="A useful diagnostic, instructional, and debugging tool" +HOMEPAGE="https://strace.io/" + +LICENSE="BSD" +SLOT="0" +IUSE="aio perl static unwind elfutils" + +REQUIRED_USE="?? ( unwind elfutils )" + +LIB_DEPEND=" + unwind? ( sys-libs/libunwind[static-libs(+)] ) + elfutils? ( dev-libs/elfutils[static-libs(+)] ) +" +# strace only uses the header from libaio to decode structs +DEPEND=" + static? ( ${LIB_DEPEND} ) + aio? ( >=dev-libs/libaio-0.3.106 ) + sys-kernel/linux-headers +" +RDEPEND=" + !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + perl? ( dev-lang/perl ) +" + +src_prepare() { + default + + if [[ ! -e configure ]] ; then + # git generation + ./xlat/gen.sh || die + ./generate_mpers_am.sh || die + eautoreconf + [[ ! -e CREDITS ]] && cp CREDITS{.in,} + fi + + filter-lfs-flags # configure handles this sanely + # Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread. + use static && append-ldflags -static -pthread + + 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 + sed -i '1iexit 77' tests*/strace-k.test || die +} + +src_configure() { + # Set up the default build settings, and then use the names strace expects. + tc-export_build_env BUILD_{CC,CPP} + local v bv + for v in CC CPP {C,CPP,LD}FLAGS ; do + bv="BUILD_${v}" + export "${v}_FOR_BUILD=${!bv}" + done + + # Don't require mpers support on non-multilib systems. #649560 + econf \ + --enable-mpers=check \ + $(use_with unwind libunwind) \ + $(use_with elfutils libdw) +} + +src_test() { + if has usersandbox $FEATURES ; then + ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044 + return 0 + fi + + default +} + +src_install() { + default + use perl || rm "${ED%/}"/usr/bin/strace-graph + dodoc CREDITS +} diff --git a/dev-util/strace/strace-4.23.ebuild b/dev-util/strace/strace-4.23.ebuild deleted file mode 100644 index 216395c678c1..000000000000 --- a/dev-util/strace/strace-4.23.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="https://github.com/strace/strace.git" - inherit git-r3 autotools -else - SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" -fi - -DESCRIPTION="A useful diagnostic, instructional, and debugging tool" -HOMEPAGE="https://strace.io/" - -LICENSE="BSD" -SLOT="0" -IUSE="aio perl static unwind" - -LIB_DEPEND="unwind? ( sys-libs/libunwind[static-libs(+)] )" -# strace only uses the header from libaio to decode structs -DEPEND=" - static? ( ${LIB_DEPEND} ) - aio? ( >=dev-libs/libaio-0.3.106 ) - sys-kernel/linux-headers -" -RDEPEND=" - !static? ( ${LIB_DEPEND//\[static-libs(+)]} ) - perl? ( dev-lang/perl ) -" - -src_prepare() { - default - - if [[ ! -e configure ]] ; then - # git generation - ./xlat/gen.sh || die - ./generate_mpers_am.sh || die - eautoreconf - [[ ! -e CREDITS ]] && cp CREDITS{.in,} - fi - - filter-lfs-flags # configure handles this sanely - # Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread. - use static && append-ldflags -static -pthread - - 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 - sed -i '1iexit 77' tests*/strace-k.test || die -} - -src_configure() { - # Set up the default build settings, and then use the names strace expects. - tc-export_build_env BUILD_{CC,CPP} - local v bv - for v in CC CPP {C,CPP,LD}FLAGS ; do - bv="BUILD_${v}" - export "${v}_FOR_BUILD=${!bv}" - done - - # Don't require mpers support on non-multilib systems. #649560 - econf \ - --enable-mpers=check \ - $(use_with unwind libunwind) -} - -src_test() { - if has usersandbox $FEATURES ; then - ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044 - return 0 - fi - - default -} - -src_install() { - default - use perl || rm "${ED%/}"/usr/bin/strace-graph - dodoc CREDITS -} diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild index f9e3966c500e..bac8d4b752b0 100644 --- a/dev-util/strace/strace-9999.ebuild +++ b/dev-util/strace/strace-9999.ebuild @@ -18,9 +18,14 @@ HOMEPAGE="https://strace.io/" LICENSE="BSD" SLOT="0" -IUSE="aio perl static unwind" +IUSE="aio perl static unwind elfutils" -LIB_DEPEND="unwind? ( sys-libs/libunwind[static-libs(+)] )" +REQUIRED_USE="?? ( unwind elfutils )" + +LIB_DEPEND=" + unwind? ( sys-libs/libunwind[static-libs(+)] ) + elfutils? ( dev-libs/elfutils[static-libs(+)] ) +" # strace only uses the header from libaio to decode structs DEPEND=" static? ( ${LIB_DEPEND} ) @@ -66,7 +71,8 @@ src_configure() { # Don't require mpers support on non-multilib systems. #649560 econf \ --enable-mpers=check \ - $(use_with unwind libunwind) + $(use_with unwind libunwind) \ + $(use_with elfutils libdw) } src_test() { @@ -80,6 +86,6 @@ src_test() { src_install() { default - use perl || rm "${ED}"/usr/bin/strace-graph + use perl || rm "${ED%/}"/usr/bin/strace-graph dodoc CREDITS } -- cgit v1.2.3