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 D475E159C9B for ; Thu, 8 Aug 2024 14:50:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 15A56E2A32; Thu, 8 Aug 2024 14:50:40 +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 E437AE2A32 for ; Thu, 8 Aug 2024 14:50:39 +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 B1E09335D6D for ; Thu, 8 Aug 2024 14:50:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1FA391DCA for ; Thu, 8 Aug 2024 14:50:37 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1723128486.b1f29637d0d61a0999ac192c88d27e89c5e48aa6.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/mercurial/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-vcs/mercurial/mercurial-6.5.3.ebuild dev-vcs/mercurial/mercurial-6.6.2.ebuild dev-vcs/mercurial/mercurial-6.7.4.ebuild dev-vcs/mercurial/mercurial-6.8.ebuild dev-vcs/mercurial/mercurial-9999.ebuild X-VCS-Directories: dev-vcs/mercurial/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: b1f29637d0d61a0999ac192c88d27e89c5e48aa6 X-VCS-Branch: master Date: Thu, 8 Aug 2024 14:50:37 +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: ce30ce38-557b-48b6-af28-286dd891c8ad X-Archives-Hash: ac0227ad54ae4f30869c796a903f25a5 commit: b1f29637d0d61a0999ac192c88d27e89c5e48aa6 Author: James Le Cuirot gentoo org> AuthorDate: Thu Aug 8 14:47:49 2024 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Thu Aug 8 14:48:06 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1f29637 dev-vcs/mercurial: Fix upstream's assumed Rust target directory This would have previously broken with USE=debug, but a recent eclass change caused it to break all the time. The target directory is now dynamic so use sed for now, but I'll see if I can patch it to use environment variables when I have more time. Closes: https://bugs.gentoo.org/937554 Signed-off-by: James Le Cuirot gentoo.org> dev-vcs/mercurial/mercurial-6.5.3.ebuild | 7 +++++++ dev-vcs/mercurial/mercurial-6.6.2.ebuild | 7 +++++++ dev-vcs/mercurial/mercurial-6.7.4.ebuild | 7 +++++++ dev-vcs/mercurial/mercurial-6.8.ebuild | 7 +++++++ dev-vcs/mercurial/mercurial-9999.ebuild | 7 +++++++ 5 files changed, 35 insertions(+) diff --git a/dev-vcs/mercurial/mercurial-6.5.3.ebuild b/dev-vcs/mercurial/mercurial-6.5.3.ebuild index ab3945e86821..85d2231bfc00 100644 --- a/dev-vcs/mercurial/mercurial-6.5.3.ebuild +++ b/dev-vcs/mercurial/mercurial-6.5.3.ebuild @@ -206,6 +206,13 @@ python_prepare_all() { sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die + # Build assumes the Rust target directory, which is wrong for us. + sed -i -r "s:\brust[/,' ]+target[/,' ]+release\b:rust/$(cargo_target_dir):g" \ + Makefile \ + setup.py \ + tests/run-tests.py \ + || die + distutils-r1_python_prepare_all } diff --git a/dev-vcs/mercurial/mercurial-6.6.2.ebuild b/dev-vcs/mercurial/mercurial-6.6.2.ebuild index 6e0daef5f51e..0590d5d5179c 100644 --- a/dev-vcs/mercurial/mercurial-6.6.2.ebuild +++ b/dev-vcs/mercurial/mercurial-6.6.2.ebuild @@ -216,6 +216,13 @@ python_prepare_all() { sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die + # Build assumes the Rust target directory, which is wrong for us. + sed -i -r "s:\brust[/,' ]+target[/,' ]+release\b:rust/$(cargo_target_dir):g" \ + Makefile \ + setup.py \ + tests/run-tests.py \ + || die + distutils-r1_python_prepare_all } diff --git a/dev-vcs/mercurial/mercurial-6.7.4.ebuild b/dev-vcs/mercurial/mercurial-6.7.4.ebuild index 90e4f7551850..b2c31e30fd96 100644 --- a/dev-vcs/mercurial/mercurial-6.7.4.ebuild +++ b/dev-vcs/mercurial/mercurial-6.7.4.ebuild @@ -227,6 +227,13 @@ python_prepare_all() { sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die + # Build assumes the Rust target directory, which is wrong for us. + sed -i -r "s:\brust[/,' ]+target[/,' ]+release\b:rust/$(cargo_target_dir):g" \ + Makefile \ + setup.py \ + tests/run-tests.py \ + || die + distutils-r1_python_prepare_all } diff --git a/dev-vcs/mercurial/mercurial-6.8.ebuild b/dev-vcs/mercurial/mercurial-6.8.ebuild index 6131cdb5b538..6bde814f104e 100644 --- a/dev-vcs/mercurial/mercurial-6.8.ebuild +++ b/dev-vcs/mercurial/mercurial-6.8.ebuild @@ -225,6 +225,13 @@ python_prepare_all() { sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die + # Build assumes the Rust target directory, which is wrong for us. + sed -i -r "s:\brust[/,' ]+target[/,' ]+release\b:rust/$(cargo_target_dir):g" \ + Makefile \ + setup.py \ + tests/run-tests.py \ + || die + distutils-r1_python_prepare_all } diff --git a/dev-vcs/mercurial/mercurial-9999.ebuild b/dev-vcs/mercurial/mercurial-9999.ebuild index 86634c6fd33c..2570197211e5 100644 --- a/dev-vcs/mercurial/mercurial-9999.ebuild +++ b/dev-vcs/mercurial/mercurial-9999.ebuild @@ -52,6 +52,13 @@ python_prepare_all() { sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die + # Build assumes the Rust target directory, which is wrong for us. + sed -i -r "s:\brust[/,' ]+target[/,' ]+release\b:rust/$(cargo_target_dir):g" \ + Makefile \ + setup.py \ + tests/run-tests.py \ + || die + distutils-r1_python_prepare_all }