From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id C2F7113838B for ; Tue, 29 Sep 2015 19:16:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 226DF21C06E; Tue, 29 Sep 2015 19:16:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AEEAA21C06E for ; Tue, 29 Sep 2015 19:16:04 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BEC0F340B09 for ; Tue, 29 Sep 2015 19:15:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1E7D9246 for ; Tue, 29 Sep 2015 19:15:57 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1443554117.ae5dc52c91c6085a54a3454e218a088dcfe39c95.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/strace/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/strace/metadata.xml dev-util/strace/strace-4.10.ebuild dev-util/strace/strace-4.9.ebuild dev-util/strace/strace-9999.ebuild X-VCS-Directories: dev-util/strace/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: ae5dc52c91c6085a54a3454e218a088dcfe39c95 X-VCS-Branch: master Date: Tue, 29 Sep 2015 19:15:57 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b54b5e80-2660-49a3-ada1-a644ec4d6f8f X-Archives-Hash: 55160b7f8b8dc52fe5843802b5cd39d0 commit: ae5dc52c91c6085a54a3454e218a088dcfe39c95 Author: Mike Frysinger gentoo org> AuthorDate: Tue Sep 29 19:12:19 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Tue Sep 29 19:15:17 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae5dc52c dev-util/strace: add USE=unwind to control libunwind usage dev-util/strace/metadata.xml | 3 +++ dev-util/strace/strace-4.10.ebuild | 13 ++++++++++--- dev-util/strace/strace-4.9.ebuild | 12 +++++++++--- dev-util/strace/strace-9999.ebuild | 13 ++++++++++--- 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/dev-util/strace/metadata.xml b/dev-util/strace/metadata.xml index 392a501..0ca954d 100644 --- a/dev-util/strace/metadata.xml +++ b/dev-util/strace/metadata.xml @@ -6,6 +6,9 @@ Enable dev-libs/libaio support for tracing Asynchronous I/O operations + + Enable stack backtraces (-k flag) via sys-libs/libunwind + strace diff --git a/dev-util/strace/strace-4.10.ebuild b/dev-util/strace/strace-4.10.ebuild index dba2a1e..59e215b 100644 --- a/dev-util/strace/strace-4.10.ebuild +++ b/dev-util/strace/strace-4.10.ebuild @@ -19,12 +19,15 @@ HOMEPAGE="http://sourceforge.net/projects/strace/" LICENSE="BSD" SLOT="0" -IUSE="aio perl static" +IUSE="aio perl static unwind" +LIB_DEPEND="unwind? ( sys-libs/libunwind[static-libs(+)] )" # strace only uses the header from libaio to decode structs -DEPEND="aio? ( >=dev-libs/libaio-0.3.106 ) +DEPEND="static? ( ${LIB_DEPEND} ) + aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers" -RDEPEND="perl? ( dev-lang/perl )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + perl? ( dev-lang/perl )" src_prepare() { if epatch_user || [[ ! -e configure ]] ; then @@ -43,6 +46,10 @@ src_prepare() { sed -i '1iexit 77' tests*/strace-k.test || die } +src_configure() { + econf $(use_with unwind libunwind) +} + src_install() { default use perl || rm "${ED}"/usr/bin/strace-graph diff --git a/dev-util/strace/strace-4.9.ebuild b/dev-util/strace/strace-4.9.ebuild index 287aa8b..5fd2fd6 100644 --- a/dev-util/strace/strace-4.9.ebuild +++ b/dev-util/strace/strace-4.9.ebuild @@ -19,12 +19,14 @@ HOMEPAGE="http://sourceforge.net/projects/strace/" LICENSE="BSD" SLOT="0" -IUSE="aio +perl static" +IUSE="aio +perl static unwind" +LIB_DEPEND="unwind? ( sys-libs/libunwind[static-libs(+)] )" # strace only uses the header from libaio to decode structs -DEPEND="aio? ( >=dev-libs/libaio-0.3.106 ) +DEPEND="static? ( ${LIB_DEPEND} ) + aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers" -RDEPEND="" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" src_prepare() { if epatch_user || [[ ! -e configure ]] ; then @@ -40,6 +42,10 @@ src_prepare() { export ac_cv_header_libaio_h=$(usex aio) } +src_configure() { + econf $(use_with unwind libunwind) +} + src_install() { default use perl || rm "${ED}"/usr/bin/strace-graph diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild index 8a1e0d6..9a70150 100644 --- a/dev-util/strace/strace-9999.ebuild +++ b/dev-util/strace/strace-9999.ebuild @@ -19,12 +19,15 @@ HOMEPAGE="http://sourceforge.net/projects/strace/" LICENSE="BSD" SLOT="0" -IUSE="aio perl static" +IUSE="aio perl static unwind" +LIB_DEPEND="unwind? ( sys-libs/libunwind[static-libs(+)] )" # strace only uses the header from libaio to decode structs -DEPEND="aio? ( >=dev-libs/libaio-0.3.106 ) +DEPEND="static? ( ${LIB_DEPEND} ) + aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers" -RDEPEND="perl? ( dev-lang/perl )" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} ) + perl? ( dev-lang/perl )" src_prepare() { if epatch_user || [[ ! -e configure ]] ; then @@ -44,6 +47,10 @@ src_prepare() { sed -i '1iexit 77' tests*/strace-k.test || die } +src_configure() { + econf $(use_with unwind libunwind) +} + src_install() { default use perl || rm "${ED}"/usr/bin/strace-graph