diff options
| author |   Sam James <sam@gentoo.org> | 2021-03-16 15:33:04 +0000 |
|---|---|---|
| committer |   Lars Wendler <polynomial-c@gentoo.org> | 2021-03-18 10:21:13 +0100 |
| commit | 58774f4fbb1570837c6314c134ce5af38811c21c (patch) | |
| tree | ae4e76ecca4013e73d794602f9f4f0d745ea5a8c /dev-vcs | |
| parent | dev-vcs/git: use HTTPS in 9999 (diff) | |
| download | gentoo-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')
| -rw-r--r-- | dev-vcs/git/files/git-2.31.0-darwin-prefix-gettext.patch | 22 | ||||
| -rw-r--r-- | dev-vcs/git/git-2.31.0-r1.ebuild | 5 | ||||
| -rw-r--r-- | dev-vcs/git/git-9999-r1.ebuild | 5 | ||||
| -rw-r--r-- | dev-vcs/git/git-9999-r2.ebuild | 5 | ||||
| -rw-r--r-- | dev-vcs/git/git-9999-r3.ebuild | 5 | ||||
| -rw-r--r-- | dev-vcs/git/git-9999.ebuild | 5 |
6 files changed, 47 insertions, 0 deletions
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 diff --git a/dev-vcs/git/git-2.31.0-r1.ebuild b/dev-vcs/git/git-2.31.0-r1.ebuild index 5aeda5d427fc..bfb176d4710e 100644 --- a/dev-vcs/git/git-2.31.0-r1.ebuild +++ b/dev-vcs/git/git-2.31.0-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):' \ 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):' \ diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild index 62714c732f6f..ff37be69674c 100644 --- a/dev-vcs/git/git-9999-r2.ebuild +++ b/dev-vcs/git/git-9999-r2.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):' \ diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild index b23ee2eb4c21..c60eee31d41d 100644 --- a/dev-vcs/git/git-9999-r3.ebuild +++ b/dev-vcs/git/git-9999-r3.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):' \ diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild index 44f31ec8aa9a..ef8a11391cf3 100644 --- a/dev-vcs/git/git-9999.ebuild +++ b/dev-vcs/git/git-9999.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):' \ |