dev-vcs/git: Sync with Gentoo

It's from Gentoo commit a6239a3ffb532529f45878e887df49319afb759e.
This commit is contained in:
Flatcar Buildbot 2025-02-25 12:34:21 +01:00 committed by Krzesimir Nowak
parent c74392b819
commit a76baeb79e
3 changed files with 44 additions and 0 deletions

View File

@ -0,0 +1,39 @@
meson.build: allow to disable fsmonitor backend for macOS
Gentoo Prefix toolchain and setup does not enable CoreServices Framework
by default, so simply allow to disable the fsmonitor backend
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
--- a/meson.build
+++ b/meson.build
@@ -1117,11 +1117,13 @@
endif
fsmonitor_backend = ''
-if host_machine.system() == 'windows'
- fsmonitor_backend = 'win32'
-elif host_machine.system() == 'darwin'
- fsmonitor_backend = 'darwin'
- libgit_dependencies += dependency('CoreServices')
+if get_option('fsmonitor')
+ if host_machine.system() == 'windows'
+ fsmonitor_backend = 'win32'
+ elif host_machine.system() == 'darwin'
+ fsmonitor_backend = 'darwin'
+ libgit_dependencies += dependency('CoreServices')
+ endif
endif
if fsmonitor_backend != ''
libgit_c_args += '-DHAVE_FSMONITOR_DAEMON_BACKEND'
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -57,6 +57,8 @@
# Build tweaks.
option('macos_use_homebrew_gettext', type: 'boolean', value: true,
description: 'Use gettext from Homebrew instead of the slightly-broken system-provided one.')
+option('fsmonitor', type: 'boolean', value: true,
+ description: 'Build fsmonitor backend on supported platforms.')
# gitweb configuration.
option('gitweb_config', type: 'string', value: 'gitweb_config.perl')

View File

@ -150,6 +150,7 @@ RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}"/${PN}-2.48.0-doc-deps.patch
"${FILESDIR}"/${PN}-2.48.1-parallel-build.patch
"${FILESDIR}"/${PN}-2.48.1-macos-no-fsmonitor.patch
)
pkg_setup() {
@ -205,9 +206,12 @@ src_configure() {
$(meson_feature perl)
$(meson_feature perforce python)
$(meson_use test tests)
-Dmacos_use_homebrew_gettext=false
-Dperl_cpan_fallback=false
)
[[ ${CHOST} == *-darwin* ]] && emesonargs+=( -Dfsmonitor=false )
# For non-live, we use a downloaded docs tarball instead.
if [[ ${PV} == *9999 ]] || use doc ; then
emesonargs+=(

View File

@ -204,6 +204,7 @@ src_configure() {
$(meson_feature perl)
$(meson_feature perforce python)
$(meson_use test tests)
-Dmacos_use_homebrew_gettext=false
-Dperl_cpan_fallback=false
)