From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A9EEE158095 for ; Mon, 29 Aug 2022 22:38:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92F68E0922; Mon, 29 Aug 2022 22:38:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 776B4E0922 for ; Mon, 29 Aug 2022 22:38:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6BCEB34104C for ; Mon, 29 Aug 2022 22:38:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 02B6E5A2 for ; Mon, 29 Aug 2022 22:38:45 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1661812704.8538cf87ad5782d028faca00ddc0ce13073e3bdc.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/strace/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-util/strace/strace-9999.ebuild X-VCS-Directories: dev-util/strace/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 8538cf87ad5782d028faca00ddc0ce13073e3bdc X-VCS-Branch: master Date: Mon, 29 Aug 2022 22:38:45 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b186880d-88db-4ae2-b7f0-ba7a636f000f X-Archives-Hash: 94a4692291a768fcf2aae4b3009bf011 commit: 8538cf87ad5782d028faca00ddc0ce13073e3bdc Author: Petr Vaněk atlas cz> AuthorDate: Fri Aug 26 12:50:46 2022 +0000 Commit: Sam James gentoo org> CommitDate: Mon Aug 29 22:38:24 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8538cf87 dev-util/strace: fix live ebuild It is necessary to call ./bootstrap script before eautoreconf, otherwise automake fails complaining about missing files or directories. The live ebuild is broken since commit a6b222b1be5b, where eautoreconf started to be used even for non-live ebuilds, but it was wrongly placed. Additionally, edo function is used for ./bootstrap call. Fixes: a6b222b1be5b ("dev-util/strace: Fix building with USE="static".") Signed-off-by: Petr Vaněk atlas.cz> Closes: https://github.com/gentoo/gentoo/pull/27038 Signed-off-by: Sam James gentoo.org> dev-util/strace/strace-9999.ebuild | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild index edcd42346ba7..49ada010927a 100644 --- a/dev-util/strace/strace-9999.ebuild +++ b/dev-util/strace/strace-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit autotools flag-o-matic toolchain-funcs +inherit autotools edo flag-o-matic toolchain-funcs if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://github.com/strace/strace.git" @@ -45,16 +45,15 @@ PATCHES=( src_prepare() { default - eautoreconf - if [[ ! -e configure ]] ; then # git generation sed /autoreconf/d -i bootstrap || die - ./bootstrap || die - eautoreconf + edo ./bootstrap [[ ! -e CREDITS ]] && cp CREDITS{.in,} fi + eautoreconf + # Stub out the -k test since it's known to be flaky. bug #545812 sed -i '1iexit 77' tests*/strace-k.test || die }