diff options
| author | Repository mirror & CI <repomirrorci@gentoo.org> | 2025-12-04 18:30:45 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2025-12-04 18:30:45 +0000 |
| commit | 3ee84d976f959034ecf3b0347f74486084e493bb (patch) | |
| tree | ab777cf7c3cf928e5983dc0094d73814aec224ae /dev-vcs/git/files/git-2.48.1-docs.patch | |
| parent | 26f53ff11013ab4ccb8816d812148f7850458899 (diff) | |
| parent | 64a3a0e16b87d21e6b98b169e3a237581ac90816 (diff) | |
| download | gentoo-3ee84d976f959034ecf3b0347f74486084e493bb.tar.gz gentoo-3ee84d976f959034ecf3b0347f74486084e493bb.tar.bz2 gentoo-3ee84d976f959034ecf3b0347f74486084e493bb.zip | |
Merge updates from master
Diffstat (limited to 'dev-vcs/git/files/git-2.48.1-docs.patch')
| -rw-r--r-- | dev-vcs/git/files/git-2.48.1-docs.patch | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/dev-vcs/git/files/git-2.48.1-docs.patch b/dev-vcs/git/files/git-2.48.1-docs.patch deleted file mode 100644 index db9aeae7862d..000000000000 --- a/dev-vcs/git/files/git-2.48.1-docs.patch +++ /dev/null @@ -1,49 +0,0 @@ -[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 <eschwartz@gentoo.org> -To: git@vger.kernel.org -Cc: Patrick Steinhardt <ps@pks.im>, - Sam James <sam@gentoo.org> -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: <git.vger.kernel.org> -List-Subscribe: <mailto:git+subscribe@vger.kernel.org> -List-Unsubscribe: <mailto:git+unsubscribe@vger.kernel.org> -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 <eschwartz@gentoo.org> ---- 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 - |