mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

- When DISABLE_MAKE_JOBS or MAKE_JOBS_UNSAFE is set, also set

Browse Source 
MAKE_JOBS_NUMBER to 1. This makes it safe to do -j${MAKE_JOBS_NUMBER}
  without any extra logic.
- Cleanup ports working around the empty MAKE_JOBS_NUMBER
- This also fixes several ports that were expecting MAKE_JOBS_NUMBER
  to always have a number

Reviewed by:	bapt
Spotted by:	John Marino <draco@marino.st>
With hat:	portmgr
This commit is contained in:
Bryan Drewery 2013-05-04 14:06:08 +00:00
parent 72e61e01d5
commit 63f76304d6
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=317320
22 changed files with 4 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Mk/bsd.port.mk
View File

@ -2189,6 +2189,7 @@ CFLAGS:= ${CFLAGS:N-std=*} -std=${USE_CSTD}
# Multiple make jobs support
.if defined(DISABLE_MAKE_JOBS) || defined(MAKE_JOBS_UNSAFE)
MAKE_JOBS_NUMBER= 1
_MAKE_JOBS= #
.else
.if defined(MAKE_JOBS_SAFE) || defined(FORCE_MAKE_JOBS)

2
audio/gmidimonitor/Makefile
View File

@ -27,9 +27,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
PLIST_FILES= bin/gmidimonitor %%DATADIR%%/gmidimonitor.ui
PLIST_DIRS= %%DATADIR%%
.if defined(MAKE_JOBS_NUMBER)
MAKE_JOBS_ARGS= -j${MAKE_JOBS_NUMBER}
.endif
do-configure:
@(cd ${WRKSRC} && ./waf configure --prefix=${PREFIX} --alsa=no)

2
audio/lv2core/Makefile
View File

@ -23,9 +23,7 @@ MAKE_JOBS_SAFE= yes
WAF_VERBOSE= --verbose
.endif
.if defined(MAKE_JOBS_NUMBER)
WAF_JOBS= --jobs=${MAKE_JOBS_NUMBER}
.endif
post-patch:
@${REINPLACE_CMD} -e '/autowaf.build_pc/s|^|#|' ${WRKSRC}/wscript

2
audio/patchage/Makefile
View File

@ -37,9 +37,7 @@ CFLAGS+= -I${LOCALBASE}/include
WAF_VERBOSE= --verbose
.endif
.if defined(MAKE_JOBS_NUMBER)
WAF_JOBS= --jobs=${MAKE_JOBS_NUMBER}
.endif
post-patch:
@${REINPLACE_CMD} -e \

2
audio/raul/Makefile
View File

@ -29,9 +29,7 @@ CFLAGS+= -I${LOCALBASE}/include
WAF_VERBOSE= --verbose
.endif
.if defined(MAKE_JOBS_NUMBER)
WAF_JOBS= --jobs=${MAKE_JOBS_NUMBER}
.endif
post-patch:
@${REINPLACE_CMD} -e \

2
audio/slv2/Makefile
View File

@ -28,9 +28,7 @@ MAKE_JOBS_SAFE= yes
WAF_VERBOSE= --verbose
.endif
.if defined(MAKE_JOBS_NUMBER)
WAF_JOBS= --jobs=${MAKE_JOBS_NUMBER}
.endif
post-patch:
@${REINPLACE_CMD} -e \

2
databases/dbf/Makefile
View File

@ -36,9 +36,7 @@ CONFIGURE_ENV+= ac_cv_header_libintl_h=no
PLIST_SUB+= NLS="@comment "
.endif
.if !defined(DISABLE_MAKE_JOBS)
_make_jobs= -j${MAKE_JOBS_NUMBER}
.endif
post-extract:
@${FIND} ${WRKDIR} -name "configure" -or -name "install-sh" | \

6
editors/libreoffice/Makefile
View File

@ -84,12 +84,6 @@ DIST_SUBDIR= libreoffice
LODESTDIR= ${WRKDIR}/loinstall
WRKSRC= ${WRKDIR}/${PORTNAME}-${LOVERSION}
.if defined(DISABLE_MAKE_JOBS)
MAKE_JOBS_NUMBER= 1
.else
MAKE_JOBS_NUMBER?= `${SYSCTL} -n kern.smp.cpus`
.endif
CONFIGURE_ENV= DMAKE=${LOCALBASE}/bin/dmake \
GPERF=${LOCALBASE}/bin/gperf \
PYTHON_CFLAGS="`${PYTHON_VERSION}-config --cflags`" \

2
games/tuxmath/Makefile
View File

@ -62,9 +62,7 @@ CONFIGURE_ARGS+=--without-rsvg
.endif
# use multiple make jobs for T4K_WRKSRC
.if !defined(DISABLE_MAKE_JOBS)
_make_jobs= -j${MAKE_JOBS_NUMBER}
.endif
post-extract:
@${LN} -sf ${T4K_WRKSRC} ${WRKDIR}/${T4K_NAME}

2
games/tuxtype/Makefile
View File

@ -63,9 +63,7 @@ CONFIGURE_ARGS+=--without-rsvg
.endif
# use multiple make jobs for T4K_WRKSRC
.if !defined(DISABLE_MAKE_JOBS)
_make_jobs= -j${MAKE_JOBS_NUMBER}
.endif
post-extract:
@${LN} -sf ${T4K_WRKSRC} ${WRKDIR}/${T4K_NAME}

2
graphics/mapnik/Makefile
View File

@ -127,9 +127,7 @@ IGNORE= does not install: runs out of virtual memory
SCONS_ARGS+= WARNING_CXXFLAGS=${WARNING_CXXFLAGS}
SCONS_ARGS+= INPUT_PLUGINS="`${ECHO} ${INPUT_PLUGINS} | ${TR} ' ' ,`"
.if defined (MAKE_JOBS_NUMBER)
SCONS_ARGS+= JOBS=${MAKE_JOBS_NUMBER}
.endif
pre-configure:
.if ${PORT_OPTIONS:MSQLITE3}

4
java/openjdk6/Makefile
View File

@ -212,11 +212,7 @@ MAKE_ENV+= CCC="${CXX}" GCC="${CC}"
MAKE_ENV+= WARNINGS_ARE_ERRORS="${WARNINGS_ARE_ERRORS}"
# XXX Turn off parallel build by default.
.if defined(DISABLE_MAKE_JOBS) || !defined(FORCE_MAKE_JOBS)
BUILD_JOBS_NUMBER= 1
.elif defined(FORCE_MAKE_JOBS)
BUILD_JOBS_NUMBER= ${MAKE_JOBS_NUMBER}
.endif
_MAKE_JOBS= #
MAKE_ENV+= ALT_PARALLEL_COMPILE_JOBS=${BUILD_JOBS_NUMBER} \
HOTSPOT_BUILD_JOBS=${BUILD_JOBS_NUMBER}

9
java/openjdk7/Makefile
View File

@ -99,14 +99,7 @@ MAKE_ENV+= LANG="C" \
JDK_MICRO_VERSION="0_${PORT_MINOR_VERSION}" \
BUILD_NUMBER="b${PORT_BUILD_NUMBER}"
.if !defined(DISABLE_MAKE_JOBS)
.if defined(MAKE_JOBS_NUMBER)
BUILD_JOBS_NUMBER= ${MAKE_JOBS_NUMBER}
.else
BUILD_JOBS_NUMBER= `${SYSCTL} -n kern.smp.cpus`
.endif
MAKE_ENV+= HOTSPOT_BUILD_JOBS=${BUILD_JOBS_NUMBER}
.endif
MAKE_ENV+= HOTSPOT_BUILD_JOBS=${MAKE_JOBS_NUMBER}
BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk7 \
${LOCALBASE}/openjdk6 \

7
math/polymake/Makefile
View File

@ -53,18 +53,15 @@ USE_LDCONFIG= yes
IGNORE= does not build with Perl 5.14+
.endif
.if !defined(DISABLE_MAKE_JOBS)
pre-fetch:
@MAKE_JOBS_NUMBER=${MAKE_JOBS_NUMBER}; \
if [ $${MAKE_JOBS_NUMBER} -gt 1 ]; then \
@if [ ${MAKE_JOBS_NUMBER} -gt 1 ]; then \
${ECHO_CMD} "Building this port uses a lot of CPU power, and a lot of memory to the point"; \
${ECHO_CMD} "that swap space might be used extensively. Consider using less threads, as"; \
${ECHO_CMD} "this might cause the build to be considerably faster. Currently the build is"; \
${ECHO_CMD} "set to use $${MAKE_JOBS_NUMBER} threads. To change to <n> threads, use"; \
${ECHO_CMD} "set to use ${MAKE_JOBS_NUMBER} threads. To change to <n> threads, use"; \
${ECHO_CMD}; \
${ECHO_CMD} "make MAKE_JOBS_NUMBER=<n>"; \
fi
.endif
post-install:
${INSTALL_DATA} ${PREFIX}/libexec/polymake/conf.make ${PREFIX}/libexec/polymake/conf.make.in

2
math/sage/Makefile
View File

@ -168,8 +168,6 @@ FPM_FLAG= -mfpmath=387
FPM_FLAG=
.endif
.if !defined(DISABLE_MAKE_JOBS)
MAKE_ENV+= MAKE="${MAKE} -j${MAKE_JOBS_NUMBER}"
.endif
.include <bsd.port.post.mk>

2
multimedia/aegisub/Makefile
View File

@ -136,9 +136,7 @@ CONFIGURE_ARGS+= --without-lua
.endif
# use multiple make jobs for FFMS_WRKSRC
.if !defined(DISABLE_MAKE_JOBS)
_make_jobs= -j${MAKE_JOBS_NUMBER}
.endif
post-extract:
.for i in ${FFMS_DISTFILE}

5
www/midori/Makefile
View File

@ -28,12 +28,7 @@ CONFIGURE_ARGS+=--enable-libnotify \
--enable-docs \
--disable-gtk3
# if user has set DISABLE_MAKE_JOBS, then MAKE_JOBS_NUMBER is undefined
.if defined(DISABLE_MAKE_JOBS)
CONFIGURE_ARGS+=--jobs=1
.else
CONFIGURE_ARGS+=--jobs=${MAKE_JOBS_NUMBER}
.endif
MAKE_JOBS_SAFE= yes
HAS_CONFIGURE= yes

2
www/node04/Makefile
View File

@ -43,9 +43,7 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-src__node_buffer.cc
PLIST_SUB+= SHAREDV8=""
.endif
.if !defined(DISABLE_MAKE_JOBS)
WAF_ARGS= --jobs=${MAKE_JOBS_NUMBER}
.endif
do-build:
@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} tools/waf-light ${WAF_ARGS} build)

2
www/node06/Makefile
View File

@ -37,9 +37,7 @@ USE_OPENSSL= yes
MAN1= node.1
.if !defined(DISABLE_MAKE_JOBS)
WAF_ARGS= --jobs=${MAKE_JOBS_NUMBER}
.endif
.include <bsd.port.options.mk>

2
x11-toolkits/flowcanvas/Makefile
View File

@ -31,9 +31,7 @@ CFLAGS+= -I${LOCALBASE}/include
WAF_VERBOSE= --verbose
.endif
.if defined(MAKE_JOBS_NUMBER)
WAF_JOBS= --jobs=${MAKE_JOBS_NUMBER}
.endif
post-patch:
@${REINPLACE_CMD} -e \

2
x11-wm/ede/Makefile
View File

@ -58,9 +58,7 @@ CONFIGURE_ARGS+=--disable-hal
.endif
# use multiple make jobs
.if !defined(DISABLE_MAKE_JOBS)
_make_jobs= -j${MAKE_JOBS_NUMBER}
.endif
post-patch:
@${REINPLACE_CMD} -e \

2
x11/roxterm/Makefile
View File

@ -33,9 +33,7 @@ MAITCHFLAGS= CC=${CC};CPP=${CC};CFLAGS=${CFLAGS};PARALLEL=${_make_jobs}
.include <bsd.port.options.mk>
.if !defined(DISABLE_MAKE_JOBS)
_make_jobs= ${MAKE_JOBS_NUMBER}
.endif
post-patch:
@${REINPLACE_CMD} -e \