Merge pull request #55729 from tilpner/groff-man-determinism

groff: Remove indeterminism in manpages
This commit is contained in:
Linus Heckemann 2019-02-14 12:30:17 +01:00 committed by GitHub
commit 3cf2745c30
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions

View file

@ -18,7 +18,10 @@ stdenv.mkDerivation rec {
enableParallelBuilding = false;
patches = [ ./look-for-ar.patch ];
patches = [
./look-for-ar.patch
./mdate-determinism.patch
];
postPatch = stdenv.lib.optionalString (psutils != null) ''
substituteInPlace src/preproc/html/pre-html.cpp \

View file

@ -0,0 +1,13 @@
diff --git a/Makefile.comm b/Makefile.comm
index 75efc22..b757000 100644
--- a/Makefile.comm
+++ b/Makefile.comm
@@ -155,7 +155,7 @@ extraclean: distclean
-e "s|@MAN1EXT@|$(man1ext)|g" \
-e "s|@MAN5EXT@|$(man5ext)|g" \
-e "s|@MAN7EXT@|$(man7ext)|g" \
- -e "s|@MDATE@|`$(SHELL) $(top_srcdir)/mdate.sh $<`|g" \
+ -e "s|@MDATE@|`date +'%-d %B %Y' -r $(top_srcdir)/ChangeLog`|g" \
-e "s|@OLDFONTDIR@|$(oldfontdir)|g" \
-e "s|@PDFDOCDIR@|$(pdfdocdir)|g" \
-e "s|@SYSTEMMACRODIR@|$(systemtmacdir)|g" \