| 1 |
commit: 71e80ba67621b7f95a5859af2a5adec5acc5fd14 |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Aug 19 01:43:06 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Aug 19 01:43:06 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71e80ba6 |
| 7 |
|
| 8 |
dev-vcs/git: rebase Darwin patch |
| 9 |
|
| 10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 11 |
|
| 12 |
.../files/git-2.37.2-darwin-prefix-gettext.patch | 22 ++++++++++++++++++++++ |
| 13 |
dev-vcs/git/git-2.37.2.ebuild | 2 +- |
| 14 |
dev-vcs/git/git-9999-r1.ebuild | 2 +- |
| 15 |
dev-vcs/git/git-9999-r2.ebuild | 2 +- |
| 16 |
dev-vcs/git/git-9999-r3.ebuild | 2 +- |
| 17 |
dev-vcs/git/git-9999.ebuild | 2 +- |
| 18 |
6 files changed, 27 insertions(+), 5 deletions(-) |
| 19 |
|
| 20 |
diff --git a/dev-vcs/git/files/git-2.37.2-darwin-prefix-gettext.patch b/dev-vcs/git/files/git-2.37.2-darwin-prefix-gettext.patch |
| 21 |
new file mode 100644 |
| 22 |
index 000000000000..af267347e65e |
| 23 |
--- /dev/null |
| 24 |
+++ b/dev-vcs/git/files/git-2.37.2-darwin-prefix-gettext.patch |
| 25 |
@@ -0,0 +1,22 @@ |
| 26 |
+Don't examine outside of the prefix for gettext on macOS/Darwin. |
| 27 |
+https://bugs.gentoo.org/757309 |
| 28 |
+--- a/config.mak.uname |
| 29 |
++++ b/config.mak.uname |
| 30 |
+@@ -148,17 +148,6 @@ ifeq ($(uname_S),Darwin) |
| 31 |
+ HAVE_NS_GET_EXECUTABLE_PATH = YesPlease |
| 32 |
+ CSPRNG_METHOD = arc4random |
| 33 |
+ |
| 34 |
+- # Workaround for `gettext` being keg-only and not even being linked via |
| 35 |
+- # `brew link --force gettext`, should be obsolete as of |
| 36 |
+- # https://github.com/Homebrew/homebrew-core/pull/53489 |
| 37 |
+- ifeq ($(shell test -d /usr/local/opt/gettext/ && echo y),y) |
| 38 |
+- BASIC_CFLAGS += -I/usr/local/include -I/usr/local/opt/gettext/include |
| 39 |
+- BASIC_LDFLAGS += -L/usr/local/lib -L/usr/local/opt/gettext/lib |
| 40 |
+- ifeq ($(shell test -x /usr/local/opt/gettext/bin/msgfmt && echo y),y) |
| 41 |
+- MSGFMT = /usr/local/opt/gettext/bin/msgfmt |
| 42 |
+- endif |
| 43 |
+- endif |
| 44 |
+- |
| 45 |
+ # The builtin FSMonitor on MacOS builds upon Simple-IPC. Both require |
| 46 |
+ # Unix domain sockets and PThreads. |
| 47 |
+ ifndef NO_PTHREADS |
| 48 |
|
| 49 |
diff --git a/dev-vcs/git/git-2.37.2.ebuild b/dev-vcs/git/git-2.37.2.ebuild |
| 50 |
index 70bd35f67fb0..cdfdd0b66a85 100644 |
| 51 |
--- a/dev-vcs/git/git-2.37.2.ebuild |
| 52 |
+++ b/dev-vcs/git/git-2.37.2.ebuild |
| 53 |
@@ -265,7 +265,7 @@ src_prepare() { |
| 54 |
|
| 55 |
if use prefix ; then |
| 56 |
# bug #757309 |
| 57 |
- eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch |
| 58 |
+ eapply "${FILESDIR}"/git-2.37.2-darwin-prefix-gettext.patch |
| 59 |
fi |
| 60 |
|
| 61 |
sed -i \ |
| 62 |
|
| 63 |
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild |
| 64 |
index cf66a5432c9c..a3a70228f500 100644 |
| 65 |
--- a/dev-vcs/git/git-9999-r1.ebuild |
| 66 |
+++ b/dev-vcs/git/git-9999-r1.ebuild |
| 67 |
@@ -258,7 +258,7 @@ src_prepare() { |
| 68 |
|
| 69 |
if use prefix ; then |
| 70 |
# bug #757309 |
| 71 |
- eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch |
| 72 |
+ eapply "${FILESDIR}"/git-2.37.2-darwin-prefix-gettext.patch |
| 73 |
fi |
| 74 |
|
| 75 |
sed -i \ |
| 76 |
|
| 77 |
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild |
| 78 |
index cf66a5432c9c..a3a70228f500 100644 |
| 79 |
--- a/dev-vcs/git/git-9999-r2.ebuild |
| 80 |
+++ b/dev-vcs/git/git-9999-r2.ebuild |
| 81 |
@@ -258,7 +258,7 @@ src_prepare() { |
| 82 |
|
| 83 |
if use prefix ; then |
| 84 |
# bug #757309 |
| 85 |
- eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch |
| 86 |
+ eapply "${FILESDIR}"/git-2.37.2-darwin-prefix-gettext.patch |
| 87 |
fi |
| 88 |
|
| 89 |
sed -i \ |
| 90 |
|
| 91 |
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild |
| 92 |
index cf66a5432c9c..a3a70228f500 100644 |
| 93 |
--- a/dev-vcs/git/git-9999-r3.ebuild |
| 94 |
+++ b/dev-vcs/git/git-9999-r3.ebuild |
| 95 |
@@ -258,7 +258,7 @@ src_prepare() { |
| 96 |
|
| 97 |
if use prefix ; then |
| 98 |
# bug #757309 |
| 99 |
- eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch |
| 100 |
+ eapply "${FILESDIR}"/git-2.37.2-darwin-prefix-gettext.patch |
| 101 |
fi |
| 102 |
|
| 103 |
sed -i \ |
| 104 |
|
| 105 |
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild |
| 106 |
index cf66a5432c9c..a3a70228f500 100644 |
| 107 |
--- a/dev-vcs/git/git-9999.ebuild |
| 108 |
+++ b/dev-vcs/git/git-9999.ebuild |
| 109 |
@@ -258,7 +258,7 @@ src_prepare() { |
| 110 |
|
| 111 |
if use prefix ; then |
| 112 |
# bug #757309 |
| 113 |
- eapply "${FILESDIR}"/git-2.31.0-darwin-prefix-gettext.patch |
| 114 |
+ eapply "${FILESDIR}"/git-2.37.2-darwin-prefix-gettext.patch |
| 115 |
fi |
| 116 |
|
| 117 |
sed -i \ |
Archives