Attachment 78676 Details for Bug 113132 – make_jobs.diff

[patch] make_jobs.diff

make_jobs.diff (text/plain), 2.51 KB, created by Benjamin Lutz on 2007-05-29 18:10:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Benjamin Lutz

Created: 2007-05-29 18:10:04 UTC

Size: 2.51 KB

patch

obsolete

>diff -ruN Mk.orig/bsd.port.mk Mk/bsd.port.mk
>--- Mk.orig/bsd.port.mk	Tue May 29 18:36:31 2007
>+++ Mk/bsd.port.mk	Tue May 29 18:21:16 2007
>@@ -1235,6 +1235,9 @@
> .endif
> .endif
> 
>+# Get the number of CPUs
>+CPUS!=	${SYSCTL} -n kern.smp.cpus
>+
> MASTERDIR?=	${.CURDIR}
> 
> .if ${MASTERDIR} != ${.CURDIR}
>@@ -2255,6 +2258,27 @@
> 			MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" CFLAGS="${CFLAGS}" \
> 			CXXFLAGS="${CXXFLAGS}" MANPREFIX="${MANPREFIX}"
> 
>+# Set up building with multiple make jobs
>+.if defined(ENABLE_MAKE_JOBS)
>+.if !defined(ALLOW_MAKE_JOBS) && defined(MAKE_JOBS_WHITELIST)
>+ALLOW_MAKE_JOBS!=	${ECHO} " ${MAKE_JOBS_WHITELIST} " | ${GREP} -o "[[:space:]]${UNIQUENAME}[[:space:]]" || ${TRUE}
>+.if ${ALLOW_MAKE_JOBS} == ""
>+.undef ALLOW_MAKE_JOBS
>+.else
>+BUILD_FAILMSG+= "You're using MAKE_JOBS_WHITELIST to force this port to build\
>+with multiple make jobs. This is not supported. Do not report this failure\
>+but remove this port's UNIQUENAME (${UNIQUENAME}) from MAKE_JOBS_WHITELIST\
>+and try again."
>+.endif
>+.endif
>+.if defined(ALLOW_MAKE_JOBS)
>+MAKE_JOBS_NJOBS!=	${EXPR} ${CPUS} + 1
>+MAKE_JOBS_ARGS?=	-j${MAKE_JOBS_NJOBS}
>+.else
>+MAKE_JOBS_ARGS?=
>+.endif
>+.endif
>+
> PTHREAD_CFLAGS?=
> PTHREAD_LIBS?=		-pthread
> 
>@@ -3734,12 +3758,30 @@
> .if !target(do-build)
> do-build:
> .if defined(USE_GMAKE)
>-	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
>+	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_JOBS_ARGS} ${MAKE_ARGS} ${ALL_TARGET} || (\
>+		RETVAL=$$?;\
>+		if [ x != x${BUILD_FAILMSG:Q} ]; then\
>+			${PRINTF} "\n" ;\
>+			${PRINTF} "===> %s\n\n" ${BUILD_FAILMSG} | ${FMT} 75 79; \
>+		fi;\
>+		return $$RETVAL ))
> .else
> .if defined(PERL_MODBUILD)
>-	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${MAKE_ARGS} ${ALL_TARGET})
>-.else
>-	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
>+	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} ${PL_BUILD} ${MAKE_ARGS} ${ALL_TARGET} || (\
>+		RETVAL=$$?;\
>+		if [ x != x${BUILD_FAILMSG:Q} ]; then\
>+			${PRINTF} "\n" ;\
>+			${PRINTF} "===> %s\n\n" ${BUILD_FAILMSG} | ${FMT} 75 79; \
>+		fi;\
>+		return $$RETVAL ))
>+.else
>+	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_JOBS_ARGS} ${MAKE_ARGS} ${ALL_TARGET} || (\
>+		RETVAL=$$?;\
>+		if [ x != x${BUILD_FAILMSG:Q} ]; then\
>+			${PRINTF} "\n" ;\
>+			${PRINTF} "===> %s\n\n" ${BUILD_FAILMSG} | ${FMT} 75 79; \
>+		fi;\
>+		return $$RETVAL ))
> .endif
> .endif
> .endif

Actions: View | Diff

Attachments on bug 113132: 78676