svn commit: r47011 - release/10.2.0/share/mk

[Marc Fonvieille]

Author: blackend
Date: Sat Jul 18 13:26:02 2015
New Revision: 47011
URL: https://svnweb.freebsd.org/changeset/doc/47011

Log:
  MFH: r47003
  
  Log:
    Set FOP_OPTS, the variable passed by the fop shell script to the Java
    interpreter, to use the same minimum values for stack and heap space on
    all architectures.  The built-in i386 defaults are smaller than those on
    amd64, so i386 fop PDF builds ran out of space and failed.  Working
    values were copied from the amd64 defaults.
  
  Approved by:	doceng (implicit)

Modified:
  release/10.2.0/share/mk/doc.docbook.mk
Directory Properties:
  release/10.2.0/   (props changed)
  release/10.2.0/share/   (props changed)

Modified: release/10.2.0/share/mk/doc.docbook.mk
==============================================================================
--- release/10.2.0/share/mk/doc.docbook.mk	Fri Jul 17 23:02:56 2015	(r47010)
+++ release/10.2.0/share/mk/doc.docbook.mk	Sat Jul 18 13:26:02 2015	(r47011)
@@ -70,6 +70,7 @@ IMGDIR?=	${IMAGES_EN_DIR}/${DOC}s/${.CUR
 CALLOUTDIR=	${.CURDIR}/imagelib/callouts
 XSLDBLATEX=	${DOC_PREFIX}/share/xml/freebsd-dblatex.xsl
 DBLATEXOPTS?=	-I ${IMGDIR} -p ${XSLDBLATEX} -T simple -b xetex -d
+FOPJAVAOPTS?=	-Xss1024k -Xmx1431552k
 FOPOPTS?=	-c ${DOC_PREFIX}/share/misc/fop.xconf
 
 KNOWN_FORMATS=	html html.tar html-split html-split.tar \
@@ -341,13 +342,13 @@ ${DOC}.fo: ${DOC}.xml ${LOCAL_IMAGES_LIB
 
 .if ${RENDERENGINE} == "fop"
 ${DOC}.pdf: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
-	${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET}
+	${SETENV} FOP_OPTS="${FOPJAVAOPTS}" ${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET}
 
 ${DOC}.ps: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
-	${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET}
+	${SETENV} FOP_OPTS="${FOPJAVAOPTS}" ${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET}
 
 ${DOC}.rtf: ${DOC}.fo ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}
-	${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET}
+	${SETENV} FOP_OPTS="${FOPJAVAOPTS}" ${FOP} ${FOPOPTS} ${DOC}.fo ${.TARGET}
 .else
 # Default is dblatex
 ${DOC}.pdf: ${DOC}.parsed.xml ${LOCAL_IMAGES_LIB} ${LOCAL_IMAGES_PNG}