commit: b1f29637d0d61a0999ac192c88d27e89c5e48aa6 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Thu Aug 8 14:47:49 2024 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> 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 <chewi <AT> 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 }
