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
This commit is contained in:
Warren Block 2015-07-17 05:30:04 +00:00
parent 307923aba4
commit de3c946bda
Notes: svn2git 2020-12-08 03:00:23 +00:00
svn path=/head/; revision=47003

View file

@ -70,6 +70,7 @@ IMGDIR?= ${IMAGES_EN_DIR}/${DOC}s/${.CURDIR:T}
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} ${LOCAL_IMAGES_PNG} ${DOC}.parsed.xml
.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}