From 9301c2f9d1cb966ab4fd292a9e5973fff40792d5 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 19 Mar 2025 01:05:32 +0000 Subject: dev-vcs/git: fix USE=doc build issue Pull in the patch Eli sent upstream and applt it to 2.48.1 and 2.49.0; for 2.48.1, I've rebased it as credential_helper didn't exist then. Closes: https://bugs.gentoo.org/949247 Thanks-to: Eli Schwartz Signed-off-by: Sam James --- dev-vcs/git/files/git-2.48.1-docs.patch | 49 +++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 dev-vcs/git/files/git-2.48.1-docs.patch (limited to 'dev-vcs/git/files/git-2.48.1-docs.patch') diff --git a/dev-vcs/git/files/git-2.48.1-docs.patch b/dev-vcs/git/files/git-2.48.1-docs.patch new file mode 100644 index 000000000000..db9aeae7862d --- /dev/null +++ b/dev-vcs/git/files/git-2.48.1-docs.patch @@ -0,0 +1,49 @@ +[This is the same as git-2.49.1-docs.patch, but modified to apply to 2.48.1.] + +https://public-inbox.org/git/20250316060605.166364-1-eschwartz@gentoo.org/T/ + +From: Eli Schwartz +To: git@vger.kernel.org +Cc: Patrick Steinhardt , + Sam James +Subject: [PATCH] meson: fix perl detection when docs are enabled, but perl bindings aren't +Date: Sun, 16 Mar 2025 02:06:05 -0400 +Message-ID: <20250316060605.166364-1-eschwartz@gentoo.org> +X-Mailer: git-send-email 2.48.1 +Precedence: bulk +X-Mailing-List: git@vger.kernel.org +List-Id: +List-Subscribe: +List-Unsubscribe: +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit + +The `perl` variable in meson.build is assigned to a program lookup, +which may have the value "not-found object" if configuring with +`-Dperl=disabled`. + +There is already a list of other cases where we do need a perl command, +even when not building perl bindings. Building documentation should be +one of those cases, but was missing from the list. Add it. + +Fixes: + +``` +$ meson setup builddir/ -Ddocs=man -Dperl=disabled -Dtests=false +[...] +Documentation/meson.build:308:22: ERROR: Tried to use not-found external program in "command" +``` + +Bug: https://bugs.gentoo.org/949247 +Signed-off-by: Eli Schwartz +--- a/meson.build ++++ b/meson.build +@@ -749,7 +749,7 @@ endif + # features. It is optional if you want to neither execute tests nor use any of + # these optional features. + perl_required = get_option('perl') +-if get_option('tests') or get_option('gitweb').enabled() ++if get_option('tests') or get_option('gitweb').enabled() or get_option('docs') != [] + perl_required = true + endif + -- cgit v1.2.3