svn commit: r47003 - head/share/mk

[Warren Block]

Author: wblock
Date: Fri Jul 17 05:30:04 2015
New Revision: 47003
URL: https://svnweb.freebsd.org/changeset/doc/47003

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.
  
  Reviewed by:	gabor, blackend, hrs
  Approved by:	hrs

Modified:
  head/share/mk/doc.docbook.mk

Modified: head/share/mk/doc.docbook.mk
==============================================================================
--- head/share/mk/doc.docbook.mk	Fri Jul 17 05:14:52 2015	(r47002)
+++ head/share/mk/doc.docbook.mk	Fri Jul 17 05:30:04 2015	(r47003)
@@ -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}