From 58774f4fbb1570837c6314c134ce5af38811c21c Mon Sep 17 00:00:00 2001 From: Sam James Date: Tue, 16 Mar 2021 15:33:04 +0000 Subject: 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 Closes: https://github.com/gentoo/gentoo/pull/19954 Signed-off-by: Lars Wendler --- .../files/git-2.31.0-darwin-prefix-gettext.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 dev-vcs/git/files/git-2.31.0-darwin-prefix-gettext.patch (limited to 'dev-vcs/git/files') diff --git a/dev-vcs/git/files/git-2.31.0-darwin-prefix-gettext.patch b/dev-vcs/git/files/git-2.31.0-darwin-prefix-gettext.patch new file mode 100644 index 000000000000..df87def6073d --- /dev/null +++ b/dev-vcs/git/files/git-2.31.0-darwin-prefix-gettext.patch @@ -0,0 +1,22 @@ +Don't examine outside of the prefix for gettext on macOS/Darwin. +https://bugs.gentoo.org/757309 +--- a/config.mak.uname ++++ b/config.mak.uname +@@ -136,17 +136,6 @@ ifeq ($(uname_S),Darwin) + HAVE_BSD_SYSCTL = YesPlease + FREAD_READS_DIRECTORIES = UnfortunatelyYes + HAVE_NS_GET_EXECUTABLE_PATH = YesPlease +- +- # Workaround for `gettext` being keg-only and not even being linked via +- # `brew link --force gettext`, should be obsolete as of +- # https://github.com/Homebrew/homebrew-core/pull/53489 +- ifeq ($(shell test -d /usr/local/opt/gettext/ && echo y),y) +- BASIC_CFLAGS += -I/usr/local/include -I/usr/local/opt/gettext/include +- BASIC_LDFLAGS += -L/usr/local/lib -L/usr/local/opt/gettext/lib +- ifeq ($(shell test -x /usr/local/opt/gettext/bin/msgfmt && echo y),y) +- MSGFMT = /usr/local/opt/gettext/bin/msgfmt +- endif +- endif + endif + ifeq ($(uname_S),SunOS) + NEEDS_SOCKET = YesPlease -- cgit v1.2.3