View | Details | Raw Unified | Return to bug 199930
Collapse All | Expand All

(-)Makefile (-6 / +36 lines)
Lines 178-191 Link Here
178
GNU_CONFIGURE=	yes
178
GNU_CONFIGURE=	yes
179
WRKSUBDIR=	${WRKDIR}/aoo-${AOOVERSION}
179
WRKSUBDIR=	${WRKDIR}/aoo-${AOOVERSION}
180
WRKSRC?=	${WRKSUBDIR}/main
180
WRKSRC?=	${WRKSUBDIR}/main
181
BASH?=		${PREFIX}/bin/bash
182
SUB_FILES=	pkg-message
181
SUB_FILES=	pkg-message
183
SUB_LIST=	EXECBASE=${EXECBASE} AOOTAG=${AOOTAG} AOOUDIR=${AOOUDIR}
182
SUB_LIST=	EXECBASE=${EXECBASE} AOOTAG=${AOOTAG} AOOUDIR=${AOOUDIR}
184
183
185
.if defined(DISABLE_MAKE_JOBS)
186
MAKE_JOBS_NUMBER=	4
187
.endif
188
189
CONFIGURE_ARGS+=							\
184
CONFIGURE_ARGS+=							\
190
			--with-system-apache-commons=yes		\
185
			--with-system-apache-commons=yes		\
191
			--with-commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \
186
			--with-commons-codec-jar=${JAVALIBDIR}/commons-codec.jar \
Lines 300-306 Link Here
300
	cd ${WRKSUBDIR} ; ${PRINTF} "main=active\n" >> source_config
295
	cd ${WRKSUBDIR} ; ${PRINTF} "main=active\n" >> source_config
301
	cd ${WRKSUBDIR} ; ${PRINTF} "extras=active\n" >> source_config
296
	cd ${WRKSUBDIR} ; ${PRINTF} "extras=active\n" >> source_config
302
	cd ${WRKSRC} ; ./bootstrap
297
	cd ${WRKSRC} ; ./bootstrap
303
	cd ${WRKSRC} ; ${SETENV} "LANG=C" "LC_ALL=C" FBSD_LDFLAGS="${LDFLAGS}" ${BASH} -c "source ${FREEBSD_ENV_SET} ; cd instsetoo_native/util  ; build.pl --all -P${MAKE_JOBS_NUMBER} -- -P${MAKE_JOBS_NUMBER}"
298
	#
299
	# numproc controls the number of parallel makes.
300
	#
301
	# dmproc is passed to dmake and controls parallelization at that
302
	# level.
303
	#
304
	# dmproc > numproc seems to give shorter build times than
305
	# numproc > dmproc.
306
	#
307
	# Select values for numproc and dmproc such that:
308
	#  * numproc*dmproc >= MAKE_JOBS_NUMBER
309
	#  * minimize numproc*dmproc-MAKE_JOBS_NUMBER
310
	#  * dmproc >= numproc
311
	#  * dmproc <= 2*numproc if MAKE_JOBS_NUMBER <= 3
312
	#
313
	cd ${WRKSRC} ; . ${FREEBSD_ENV_SET} ; cd instsetoo_native/util ;  \
314
	 export LANG=C LC_ALL=C FBSD_LDFLAGS="${LDFLAGS}" ;		  \
315
	 if [ ${MAKE_JOBS_NUMBER} -le 3 ] ; then			  \
316
	  numproc=1 ; dmproc=${MAKE_JOBS_NUMBER} ;			  \
317
	 else								  \
318
	  a=1 ;								  \
319
	  while [ $$(( 2 * $${a} * $${a} )) -lt ${MAKE_JOBS_NUMBER} ]; do \
320
	   a=$$(( $${a} + 1 )) ;					  \
321
	  done ;							  \
322
	  b=$$(( $${a} + 1 )) ;						  \
323
	  ad=$$(( ( ${MAKE_JOBS_NUMBER} + $${a} - 1 ) / $${a} )) ;	  \
324
	  ap=$$(( $${a} * $${ad} )) ;					  \
325
	  bd=$$(( ( ${MAKE_JOBS_NUMBER} + $${b} - 1 ) / $${b} )) ;	  \
326
	  bp=$$(( $${b} * $${bd} )) ;					  \
327
	  if [ $${ap} -le $${bp} ]; then				  \
328
	   numproc=$${a} ; dmproc=$${ad} ;				  \
329
	  else								  \
330
	   numproc=$${b} ; dmproc=$${bd} ;				  \
331
	  fi ;								  \
332
	 fi ;								  \
333
	 build.pl --all -P$${numproc} -- -P$${dmproc}
304
334
305
do-install:
335
do-install:
306
	cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; ${LS} *.tar.?z > ${WRKDIR}/INSTALLFILES
336
	cd ${WRKSRC}/instsetoo_native/unxfbsd?.pro/Apache_OpenOffice/archive/install/${LOCALIZED_LANG}/ ; ${LS} *.tar.?z > ${WRKDIR}/INSTALLFILES

Return to bug 199930