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 1A03F158013 for ; Wed, 13 Dec 2023 07:47:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4FDF82BC01E; Wed, 13 Dec 2023 07:47:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 31F872BC01E for ; Wed, 13 Dec 2023 07:47:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 smtp.gentoo.org (Postfix) with ESMTPS id 57463335D7B for ; Wed, 13 Dec 2023 07:47:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B4E499C7 for ; Wed, 13 Dec 2023 07:47:13 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1702453599.05a44653f0cb459b22349e4b15c447ac70bf09be.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-core/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/bitcoin-core/bitcoin-core-26.0.ebuild X-VCS-Directories: net-p2p/bitcoin-core/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 05a44653f0cb459b22349e4b15c447ac70bf09be X-VCS-Branch: master Date: Wed, 13 Dec 2023 07:47:13 +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: 83c49f27-6951-49ce-ae2c-ef51f96b47a7 X-Archives-Hash: 8ad8fd626e7ccdbace7154e76be8e1ad commit: 05a44653f0cb459b22349e4b15c447ac70bf09be Author: Matt Whitlock mattwhitlock name> AuthorDate: Tue Dec 12 21:25:56 2023 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Wed Dec 13 07:46:39 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05a44653 net-p2p/bitcoin-core: fix build failure when USE="-daemon" Regenerating the example bitcoin.conf doesn't work when we didn't build bitcoind. No revbump required since it was not possible to complete a build in the affected configurations. Closes: https://bugs.gentoo.org/919772 Signed-off-by: Matt Whitlock mattwhitlock.name> Closes: https://github.com/gentoo/gentoo/pull/34255 Signed-off-by: Florian Schmaus gentoo.org> net-p2p/bitcoin-core/bitcoin-core-26.0.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net-p2p/bitcoin-core/bitcoin-core-26.0.ebuild b/net-p2p/bitcoin-core/bitcoin-core-26.0.ebuild index 6bdeaa1317a6..4e37d3fc4059 100644 --- a/net-p2p/bitcoin-core/bitcoin-core-26.0.ebuild +++ b/net-p2p/bitcoin-core/bitcoin-core-26.0.ebuild @@ -194,7 +194,9 @@ src_configure() { src_compile() { default - tc-is-cross-compiler || TOPDIR="${S}" bash contrib/devtools/gen-bitcoin-conf.sh || die + if use daemon && ! tc-is-cross-compiler ; then + TOPDIR="${S}" bash contrib/devtools/gen-bitcoin-conf.sh || die + fi sed -e 's/ To use, copy this file$//p;Tp;:0;n;/save the file\.$/!b0;d;:p;p' \ -ni share/examples/bitcoin.conf || die }