From: "Carlo Marcelo Arenas Belón" <carenas@gmail•com>
To: git@vger•kernel.org
Cc: sandals@crustytoothpaste•net,
"Carlo Marcelo Arenas Belón" <carenas@gmail•com>
Subject: [PATCH v2] meson: disable PCRE2 dependency by default in macOS
Date: Sun, 13 Jul 2025 05:23:41 -0700 [thread overview]
Message-ID: <20250713122341.17976-1-carenas@gmail.com> (raw)
In-Reply-To: <20250712172615.11364-1-carenas@gmail.com>
Makefile requires the user to provide the USE_LIBPCRE2 flag to
enable this dependency, but meson has it enabled by default,
which can be problematic, at least in macOS.
macOS provides a PCRE2 library in base that is not usable and not
configured properly, as it installs a pkgconf module that
points to a non existent pcre2.h header in /usr/local/include.
Add an option that will need to be turned to true once an
alternative PCRE2 library is installed (which hopefully provides
its own pkgconf module earlier in PKG_CONFIG_PATH) or meson has
been instructed to use the wrap by `--force-fallback-for=pcre2`
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail•com>
---
meson.build | 3 ++-
meson_options.txt | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 7fea4a34d6..e1475be6c8 100644
--- a/meson.build
+++ b/meson.build
@@ -1055,7 +1055,8 @@ else
build_options_config.set('NO_ICONV', '1')
endif
-pcre2 = dependency('libpcre2-8', required: get_option('pcre2'), default_options: ['default_library=static', 'test=false'])
+pcre2_feature = get_option('pcre2').disable_auto_if(host_machine.system() == 'darwin' and not get_option('macos_workaround_system_pcre2'))
+pcre2 = dependency('libpcre2-8', required: pcre2_feature, default_options: ['default_library=static', 'test=false'])
if pcre2.found()
libgit_dependencies += pcre2
libgit_c_args += '-DUSE_LIBPCRE2'
diff --git a/meson_options.txt b/meson_options.txt
index e7f768df24..9c0cb6bbfa 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -45,7 +45,7 @@ option('gitweb', type: 'feature', value: 'auto',
description: 'Build Git web interface. Requires Perl.')
option('iconv', type: 'feature', value: 'auto',
description: 'Support reencoding strings with different encodings.')
-option('pcre2', type: 'feature', value: 'enabled',
+option('pcre2', type: 'feature', value: 'auto',
description: 'Support Perl-compatible regular expressions in e.g. git-grep(1).')
option('perl', type: 'feature', value: 'auto',
description: 'Build tools written in Perl.')
@@ -73,6 +73,8 @@ option('breaking_changes', type: 'boolean', value: false,
description: 'Enable upcoming breaking changes.')
option('macos_use_homebrew_gettext', type: 'boolean', value: true,
description: 'Use gettext from Homebrew instead of the slightly-broken system-provided one.')
+option('macos_workaround_system_pcre2', type: 'boolean', value: false,
+ description: 'A working PCRE2 was provided or the fallback to the wrap is being forced.')
# gitweb configuration.
option('gitweb_config', type: 'string', value: 'gitweb_config.perl')
--
2.39.5 (Apple Git-154)
next prev parent reply other threads:[~2025-07-13 12:24 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-12 17:26 [PATCH] meson: disable PCRE2 dependency by default Carlo Marcelo Arenas Belón
2025-07-12 17:51 ` brian m. carlson
2025-07-14 14:00 ` Carlo Arenas
2025-07-14 15:20 ` Junio C Hamano
2025-07-14 16:46 ` Carlo Marcelo Arenas Belón
2025-07-14 16:58 ` Junio C Hamano
2025-07-13 12:23 ` Carlo Marcelo Arenas Belón [this message]
2025-07-13 15:42 ` [PATCH v2] meson: disable PCRE2 dependency by default in macOS Junio C Hamano
2025-07-13 17:48 ` [PATCH v3] " Carlo Marcelo Arenas Belón
2025-07-15 1:55 ` Eli Schwartz
2025-07-15 8:46 ` Patrick Steinhardt
2025-07-15 8:56 ` Carlo Arenas
2025-07-15 10:32 ` Patrick Steinhardt
2025-07-15 12:08 ` Carlo Arenas
2025-07-15 14:14 ` Eli Schwartz
2025-07-15 12:01 ` Carlo Arenas
2025-07-15 14:22 ` Eli Schwartz
2025-07-15 11:44 ` [PATCH v4] meson: woraround broken system PCRE2 dependency " Carlo Marcelo Arenas Belón
2025-07-15 16:48 ` Junio C Hamano
2025-07-15 16:50 ` Eric Sunshine
2025-07-16 19:30 ` [PATCH v5] meson: work around " Carlo Marcelo Arenas Belón
2025-07-16 21:13 ` Junio C Hamano
2025-07-16 21:17 ` Junio C Hamano
2025-07-16 22:10 ` Eli Schwartz
2025-07-16 22:17 ` Carlo Arenas
2025-07-18 17:02 ` [PATCH v6] " Carlo Marcelo Arenas Belón
2025-07-23 22:17 ` Junio C Hamano
2025-07-24 5:28 ` Patrick Steinhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250713122341.17976-1-carenas@gmail.com \
--to=carenas@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=sandals@crustytoothpaste$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox