File 0198-Fix-fop-font-cache-handling-during-pdf-bui... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 0198-Fix-fop-font-cache-handling-during-pdf-build.patch of Package erlang (Revision 84136f040b8e10a77a20fc548a9bd409)

Currently displaying revision 84136f040b8e10a77a20fc548a9bd409 , Show latest

From 16ca09ed823ba1c19c4a5ca28b9c801a6f53b895 Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars@erlang.org>
Date: Tue, 19 Sep 2017 14:34:27 +0200
Subject: [PATCH 1/2] Fix fop font-cache handling during pdf build

Two parallell doc builds running fop (as same user) could both
update the fop font-cache at the same time. The cache is now
created as an artifact in the build process.
---
 make/otp.mk.in | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/make/otp.mk.in b/make/otp.mk.in
index 83bab7065d..b06c51d0fb 100644
--- a/make/otp.mk.in
+++ b/make/otp.mk.in
@@ -138,7 +138,7 @@ endif
 #
 .PRECIOUS: %.erl %.fo
 
-## Uncomment these lines and add .idl to suffixes above to have erlc 
+## Uncomment these lines and add .idl to suffixes above to have erlc
 ## eat IDL files
 ##$(EGEN)/%.erl: $(ESRC)/%.idl
 ##	$(ERLC) $(IDL_FLAGS) $<
@@ -238,7 +238,7 @@ ifeq ($(PDFCOLOR),)
 PDFCOLOR = \#960003
 endif
 
-# HTML & GIF files that always are generated and must be delivered 
+# HTML & GIF files that always are generated and must be delivered
 SGML_COLL_FILES = $(SGML_APPLICATION_FILES) $(SGML_PART_FILES)
 XML_COLL_FILES = $(XML_APPLICATION_FILES) $(XML_PART_FILES)
 DEFAULT_HTML_FILES = \
@@ -326,5 +326,4 @@ $(MAN9DIR)/%.9: %.xml
 	 escript $(DOCGEN)/priv/bin/codeline_preprocessing.escript $< $@
 
 .fo.pdf:
-	$(FOP) -c $(FOP_CONFIG) -fo $< -pdf $@
-
+	$(FOP) -c $(FOP_CONFIG) -cache $(ERL_TOP)/make/$(TARGET)/fop-fonts.cache -fo $< -pdf $@
-- 
2.14.1

Places

File 0198-Fix-fop-font-cache-handling-during-pdf-build.patch of Package erlang (Revision 84136f040b8e10a77a20fc548a9bd409)

Places