diff options
| author | Marc Fonvieille <blackend@FreeBSD.org> | 2015-07-18 13:26:02 +0000 |
|---|---|---|
| committer | Marc Fonvieille <blackend@FreeBSD.org> | 2015-07-18 13:26:02 +0000 |
| commit | 9ee1646212c906ec5f58985f8d339ea3b1a1cf50 (patch) | |
| tree | 58ee723fe635db6c03b49d419fd58e4cf5f3b267 | |
| parent | 47b50ba701b478e4c0a13d04deaf842a4c220d6e (diff) | |
| download | doc-9ee1646212c906ec5f58985f8d339ea3b1a1cf50.tar.gz doc-9ee1646212c906ec5f58985f8d339ea3b1a1cf50.zip | |
MFH: r47003release/10.2.0
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)
Notes
Notes:
svn path=/head/; revision=46925
svn path=/release/10.2.0/; revision=47011; tag=release/10.2.0
| -rw-r--r-- | share/mk/doc.docbook.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/share/mk/doc.docbook.mk b/share/mk/doc.docbook.mk index 45786f33d1..1a01928e7e 100644 --- a/share/mk/doc.docbook.mk +++ b/share/mk/doc.docbook.mk @@ -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} |