summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-03-16 15:33:04 +0000
committerLars Wendler <polynomial-c@gentoo.org>2021-03-18 10:21:13 +0100
commit58774f4fbb1570837c6314c134ce5af38811c21c (patch)
treeae4e76ecca4013e73d794602f9f4f0d745ea5a8c /dev-vcs/git/git-9999-r1.ebuild
parentdev-vcs/git: use HTTPS in 9999 (diff)
downloadgentoo-58774f4fbb1570837c6314c134ce5af38811c21c.tar.gz
gentoo-58774f4fbb1570837c6314c134ce5af38811c21c.tar.bz2
gentoo-58774f4fbb1570837c6314c134ce5af38811c21c.zip
dev-vcs/git: don't search outside of prefix for gettext on Darwin
Conditionally patching so that non-prefix developers don't have to rebase on new versions. We can apply this unconditionally safely if desired though. Closes: https://bugs.gentoo.org/757309 Signed-off-by: Sam James <sam@gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/19954 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'dev-vcs/git/git-9999-r1.ebuild')
-rw-r--r--dev-vcs/git/git-9999-r1.ebuild5
1 files changed, 5 insertions, 0 deletions
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 62714c732f6f..ff37be69674c 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -260,6 +260,11 @@ src_prepare() {
default
+ if use prefix ; then
+ # bug #757309
+ eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch
+ fi
+
sed -i \
-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \