diff options
Diffstat (limited to 'dev-vcs/mercurial/mercurial-6.6.2.ebuild')
-rw-r--r-- | dev-vcs/mercurial/mercurial-6.6.2.ebuild | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/dev-vcs/mercurial/mercurial-6.6.2.ebuild b/dev-vcs/mercurial/mercurial-6.6.2.ebuild index 6e0daef5f51e..ed79e2235c03 100644 --- a/dev-vcs/mercurial/mercurial-6.6.2.ebuild +++ b/dev-vcs/mercurial/mercurial-6.6.2.ebuild @@ -207,6 +207,9 @@ src_unpack() { if use rust; then local S="${S}/rust/hg-cpython" cargo_src_unpack + else + # Needed because distutils-r1 install under cargo_env if cargo is inherited + cargo_gen_config fi } @@ -216,6 +219,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 } |