FreeBSD Bugzilla – Attachment 221742 Details for
Bug 246936
doc.docbook.mk: Fix LATESTREVISION determination, causes build failure on non-English locales
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Updated patch
0001-doc.docbook.mk-Fix-LATESTREVISION-determination-caus.patch (text/plain), 2.32 KB, created by
Olivier Certner
on 2021-01-19 14:15:25 UTC
(
hide
)
Description:
Updated patch
Filename:
MIME Type:
Creator:
Olivier Certner
Created:
2021-01-19 14:15:25 UTC
Size:
2.32 KB
patch
obsolete
>From 52c0c7ded7ad3f2d43baaabe10bb0c66d7e4948a Mon Sep 17 00:00:00 2001 >From: Olivier Certner <olce.freebsd@certner.fr> >Date: Tue, 19 Jan 2021 13:04:38 +0100 >Subject: [PATCH] doc.docbook.mk: Fix LATESTREVISION determination, causes > build failure on non-English locales > >Fixes, e.g., manual articles/books build (i.e., typing `make` in the right >directory). > >There were two problems: >1. Git or SVN information retrieval depends on the current locale, and doesn't >work with non-English ones. >2. Fallback for LATESTREVISION most of the time (sometimes works, probable >race) itself fails because PWD is set to document's directory + '/obj', but >sources are in the document's directory. > >Problem 2 is the most annoying because documentation builds simply fails >(`xsltproc` becomes unable to resolve 'latestrevision.*' variables in, e.g., >articles). But point 2's failure appears only because of point 1's failure, >which doesn't happen on a machine with English or C locale. > >PR: 246936 >--- > share/mk/doc.docbook.mk | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > >diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk >index bcab2d712d..87512278e6 100644 >--- a/share/mk/doc.docbook.mk >+++ b/share/mk/doc.docbook.mk >@@ -92,7 +92,7 @@ NO_SUBDIR= YES > # If using git, use git log. The revision won't work with the generated links, > # because it is a hash, and git log doesn't know about git svn find-rev. > .if exists(${DOC_PREFIX}/.git) && exists(${GIT}) >-LATESTREVISION!=cd ${.CURDIR} && ${GIT} log -1 --pretty=format:'\ >+LATESTREVISION!=cd ${.CURDIR} && LC_ALL=C ${GIT} log -1 --pretty=format:'\ > --stringparam latestrevision.timestamp "%ci" \ > --stringparam latestrevision.committer "%cn" \ > --stringparam latestrevision.number "%h"' ${SRCS} >@@ -102,7 +102,7 @@ LATESTREVISION!=cd ${.CURDIR} && ${GIT} log -1 --pretty=format:'\ > # the revision date from the timestamp of the most recent file and > # set the revision number to "filedate" > .if empty(LATESTREVISION) >-LATESTREVISION!=${STAT} 2>/dev/null -t '%F %T %Z' -f '\ >+LATESTREVISION!=cd ${.CURDIR} && ${STAT} 2>/dev/null -t '%F %T %Z' -f '\ > --stringparam latestrevision.timestamp "%Sc" \ > --stringparam latestrevision.committer "%Su" \ > --stringparam latestrevision.number "filedate"' \ >@@ -719,4 +719,3 @@ ${LOCAL_CSS_SHEET}: ${CSS_SHEET} > .endif > > HTML.manifest: index.html >- >-- >2.24.1 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 246936
:
215164
|
221737
|
221741
| 221742