From owner-svn-doc-all@freebsd.org Sat Jul 18 13:26:03 2015 Return-Path: Delivered-To: svn-doc-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4274D9A36AC for ; Sat, 18 Jul 2015 13:26:03 +0000 (UTC) (envelope-from blackend@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1AB9B1BDF; Sat, 18 Jul 2015 13:26:03 +0000 (UTC) (envelope-from blackend@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6IDQ2P4085180; Sat, 18 Jul 2015 13:26:02 GMT (envelope-from blackend@FreeBSD.org) Received: (from blackend@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6IDQ2P5085179; Sat, 18 Jul 2015 13:26:02 GMT (envelope-from blackend@FreeBSD.org) Message-Id: <201507181326.t6IDQ2P5085179@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: blackend set sender to blackend@FreeBSD.org using -f From: Marc Fonvieille Date: Sat, 18 Jul 2015 13:26:02 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org Subject: svn commit: r47011 - release/10.2.0/share/mk X-SVN-Group: doc-release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jul 2015 13:26:03 -0000 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}