Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-vcs/mercurial/
Date: Mon, 30 Nov 2020 08:19:06
Message-Id: 1606724338.8af544b0b4207334ce24654032ef1ba0c04b4553.grobian@gentoo
1 commit: 8af544b0b4207334ce24654032ef1ba0c04b4553
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 30 08:18:53 2020 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 30 08:18:58 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8af544b0
7
8 dev-vcs/mercurial-5.6: fix compilation on macOS using GCC
9
10 Package-Manager: Portage-3.0.9, Repoman-3.0.2
11 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
12
13 dev-vcs/mercurial/mercurial-5.6.ebuild | 1 +
14 1 file changed, 1 insertion(+)
15
16 diff --git a/dev-vcs/mercurial/mercurial-5.6.ebuild b/dev-vcs/mercurial/mercurial-5.6.ebuild
17 index 2ee7d30d061..b8aef9cdbb7 100644
18 --- a/dev-vcs/mercurial/mercurial-5.6.ebuild
19 +++ b/dev-vcs/mercurial/mercurial-5.6.ebuild
20 @@ -149,6 +149,7 @@ python_prepare_all() {
21 # fix up logic that won't work in Gentoo Prefix (also won't outside in
22 # certain cases), bug #362891
23 sed -i -e 's:xcodebuild:nocodebuild:' setup.py || die
24 + sed -i -e 's/__APPLE__/__NO_APPLE__/g' mercurial/cext/osutil.c || die
25 # Use absolute import for zstd
26 sed -i -e 's/from \.* import zstd/import zstd/' \
27 mercurial/utils/compression.py \