From owner-svn-doc-all@freebsd.org Fri Jul 17 05:30:05 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 7BE959A429C; Fri, 17 Jul 2015 05:30:05 +0000 (UTC) (envelope-from wblock@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 6452D2087; Fri, 17 Jul 2015 05:30:05 +0000 (UTC) (envelope-from wblock@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6H5U5qm099143; Fri, 17 Jul 2015 05:30:05 GMT (envelope-from wblock@FreeBSD.org) Received: (from wblock@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6H5U5sk099142; Fri, 17 Jul 2015 05:30:05 GMT (envelope-from wblock@FreeBSD.org) Message-Id: <201507170530.t6H5U5sk099142@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wblock set sender to wblock@FreeBSD.org using -f From: Warren Block Date: Fri, 17 Jul 2015 05:30:05 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r47003 - head/share/mk X-SVN-Group: doc-head 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: Fri, 17 Jul 2015 05:30:05 -0000 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}