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

(-)Mk/bsd.port.mk (-4 / +46 lines)
Lines 1235-1240 Link Here
1235
.endif
1235
.endif
1236
.endif
1236
.endif
1237
1237
1238
# Get the number of CPUs
1239
CPUS!=	${SYSCTL} -n kern.smp.cpus
1240
1238
MASTERDIR?=	${.CURDIR}
1241
MASTERDIR?=	${.CURDIR}
1239
1242
1240
.if ${MASTERDIR} != ${.CURDIR}
1243
.if ${MASTERDIR} != ${.CURDIR}
Lines 2255-2260 Link Here
2255
			MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" \
2258
			MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" \
2256
			CXXFLAGS="${CXXFLAGS}" MANPREFIX="${MANPREFIX}"
2259
			CXXFLAGS="${CXXFLAGS}" MANPREFIX="${MANPREFIX}"
2257
2260
2261
# Set up building with multiple make jobs
2262
.if defined(ENABLE_MAKE_JOBS)
2263
.if !defined(ALLOW_MAKE_JOBS) && defined(MAKE_JOBS_WHITELIST)
2264
ALLOW_MAKE_JOBS!=	${ECHO} " ${MAKE_JOBS_WHITELIST} " | ${GREP} -o "[[:space:]]${UNIQUENAME}[[:space:]]" || ${TRUE}
2265
.if ${ALLOW_MAKE_JOBS} == ""
2266
.undef ALLOW_MAKE_JOBS
2267
.else
2268
BUILD_FAILMSG+= "You're using MAKE_JOBS_WHITELIST to force this port to build\
2269
with multiple make jobs. This is not supported. Do not report this failure\
2270
but remove this port's UNIQUENAME (${UNIQUENAME}) from MAKE_JOBS_WHITELIST\
2271
and try again."
2272
.endif
2273
.endif
2274
.if defined(ALLOW_MAKE_JOBS)
2275
MAKE_JOBS_NJOBS!=	${EXPR} ${CPUS} + 1
2276
MAKE_JOBS_ARGS?=	-j${MAKE_JOBS_NJOBS}
2277
.else
2278
MAKE_JOBS_ARGS?=
2279
.endif
2280
.endif
2281
2258
PTHREAD_CFLAGS?=
2282
PTHREAD_CFLAGS?=
2259
PTHREAD_LIBS?=		-pthread
2283
PTHREAD_LIBS?=		-pthread
2260
2284
Lines 3734-3745 Link Here
3734
.if !target(do-build)
3758
.if !target(do-build)
3735
do-build:
3759
do-build:
3736
.if defined(USE_GMAKE)
3760
.if defined(USE_GMAKE)
3737
	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
3761
	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_JOBS_ARGS} ${MAKE_ARGS} ${ALL_TARGET} || (\
3762
		RETVAL=$$?;\
3763
		if [ x != x${BUILD_FAILMSG:Q} ]; then\
3764
			${PRINTF} "\n" ;\
3765
			${PRINTF} "===> %s\n\n" ${BUILD_FAILMSG} | ${FMT} 75 79; \
3766
		fi;\
3767
		return $$RETVAL ))
3738
.else
3768
.else
3739
.if defined(PERL_MODBUILD)
3769
.if defined(PERL_MODBUILD)
3740
	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${MAKE_ARGS} ${ALL_TARGET})
3770
	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${MAKE_ARGS} ${ALL_TARGET} || (\
3741
.else
3771
		RETVAL=$$?;\
3742
	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
3772
		if [ x != x${BUILD_FAILMSG:Q} ]; then\
3773
			${PRINTF} "\n" ;\
3774
			${PRINTF} "===> %s\n\n" ${BUILD_FAILMSG} | ${FMT} 75 79; \
3775
		fi;\
3776
		return $$RETVAL ))
3777
.else
3778
	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_JOBS_ARGS} ${MAKE_ARGS} ${ALL_TARGET} || (\
3779
		RETVAL=$$?;\
3780
		if [ x != x${BUILD_FAILMSG:Q} ]; then\
3781
			${PRINTF} "\n" ;\
3782
			${PRINTF} "===> %s\n\n" ${BUILD_FAILMSG} | ${FMT} 75 79; \
3783
		fi;\
3784
		return $$RETVAL ))
3743
.endif
3785
.endif
3744
.endif
3786
.endif
3745
.endif
3787
.endif

Return to bug 113132