Date: Sat, 4 May 2013 14:06:09 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r317320 - in head: Mk audio/gmidimonitor audio/lv2core audio/patchage audio/raul audio/slv2 databases/dbf editors/libreoffice games/tuxmath games/tuxtype graphics/mapnik java/openjdk6 j... Message-ID: <201305041406.r44E69Bw096955@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Sat May 4 14:06:08 2013 New Revision: 317320 URL: http://svnweb.freebsd.org/changeset/ports/317320 Log: - When DISABLE_MAKE_JOBS or MAKE_JOBS_UNSAFE is set, also set 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 Modified: head/Mk/bsd.port.mk head/audio/gmidimonitor/Makefile head/audio/lv2core/Makefile head/audio/patchage/Makefile head/audio/raul/Makefile head/audio/slv2/Makefile head/databases/dbf/Makefile head/editors/libreoffice/Makefile head/games/tuxmath/Makefile head/games/tuxtype/Makefile head/graphics/mapnik/Makefile head/java/openjdk6/Makefile head/java/openjdk7/Makefile head/math/polymake/Makefile head/math/sage/Makefile head/multimedia/aegisub/Makefile head/www/midori/Makefile head/www/node04/Makefile head/www/node06/Makefile head/x11-toolkits/flowcanvas/Makefile head/x11-wm/ede/Makefile head/x11/roxterm/Makefile Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Sat May 4 14:05:58 2013 (r317319) +++ head/Mk/bsd.port.mk Sat May 4 14:06:08 2013 (r317320) @@ -2189,6 +2189,7 @@ CFLAGS:= ${CFLAGS:N-std=*} -std=${USE_CS # 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) Modified: head/audio/gmidimonitor/Makefile ============================================================================== --- head/audio/gmidimonitor/Makefile Sat May 4 14:05:58 2013 (r317319) +++ head/audio/gmidimonitor/Makefile Sat May 4 14:06:08 2013 (r317320) @@ -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) Modified: head/audio/lv2core/Makefile ============================================================================== --- head/audio/lv2core/Makefile Sat May 4 14:05:58 2013 (r317319) +++ head/audio/lv2core/Makefile Sat May 4 14:06:08 2013 (r317320) @@ -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 Modified: head/audio/patchage/Makefile ============================================================================== --- head/audio/patchage/Makefile Sat May 4 14:05:58 2013 (r317319) +++ head/audio/patchage/Makefile Sat May 4 14:06:08 2013 (r317320) @@ -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 \ Modified: head/audio/raul/Makefile ============================================================================== --- head/audio/raul/Makefile Sat May 4 14:05:58 2013 (r317319) +++ head/audio/raul/Makefile Sat May 4 14:06:08 2013 (r317320) @@ -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 \ Modified: head/audio/slv2/Makefile ============================================================================== --- head/audio/slv2/Makefile Sat May 4 14:05:58 2013 (r317319) +++ head/audio/slv2/Makefile Sat May 4 14:06:08 2013 (r317320) @@ -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 \ Modified: head/databases/dbf/Makefile ============================================================================== --- head/databases/dbf/Makefile Sat May 4 14:05:58 2013 (r317319) +++ head/databases/dbf/Makefile Sat May 4 14:06:08 2013 (r317320) @@ -36,9 +36,7 @@ CONFIGURE_ENV+= ac_cv_header_libintl_h=n 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" | \ Modified: head/editors/libreoffice/Makefile ============================================================================== --- head/editors/libreoffice/Makefile Sat May 4 14:05:58 2013 (r317319) +++ head/editors/libreoffice/Makefile Sat May 4 14:06:08 2013 (r317320) @@ -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`" \ Modified: head/games/tuxmath/Makefile ============================================================================== --- head/games/tuxmath/Makefile Sat May 4 14:05:58 2013 (r317319) +++ head/games/tuxmath/Makefile Sat May 4 14:06:08 2013 (r317320) @@ -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} Modified: head/games/tuxtype/Makefile ============================================================================== --- head/games/tuxtype/Makefile Sat May 4 14:05:58 2013 (r317319) +++ head/games/tuxtype/Makefile Sat May 4 14:06:08 2013 (r317320) @@ -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} Modified: head/graphics/mapnik/Makefile ============================================================================== --- head/graphics/mapnik/Makefile Sat May 4 14:05:58 2013 (r317319) +++ head/graphics/mapnik/Makefile Sat May 4 14:06:08 2013 (r317320) @@ -127,9 +127,7 @@ IGNORE= does not install: runs out of v 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} Modified: head/java/openjdk6/Makefile ============================================================================== --- head/java/openjdk6/Makefile Sat May 4 14:05:58 2013 (r317319) +++ head/java/openjdk6/Makefile Sat May 4 14:06:08 2013 (r317320) @@ -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} Modified: head/java/openjdk7/Makefile ============================================================================== --- head/java/openjdk7/Makefile Sat May 4 14:05:58 2013 (r317319) +++ head/java/openjdk7/Makefile Sat May 4 14:06:08 2013 (r317320) @@ -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 \ Modified: head/math/polymake/Makefile ============================================================================== --- head/math/polymake/Makefile Sat May 4 14:05:58 2013 (r317319) +++ head/math/polymake/Makefile Sat May 4 14:06:08 2013 (r317320) @@ -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 Modified: head/math/sage/Makefile ============================================================================== --- head/math/sage/Makefile Sat May 4 14:05:58 2013 (r317319) +++ head/math/sage/Makefile Sat May 4 14:06:08 2013 (r317320) @@ -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> Modified: head/multimedia/aegisub/Makefile ============================================================================== --- head/multimedia/aegisub/Makefile Sat May 4 14:05:58 2013 (r317319) +++ head/multimedia/aegisub/Makefile Sat May 4 14:06:08 2013 (r317320) @@ -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} Modified: head/www/midori/Makefile ============================================================================== --- head/www/midori/Makefile Sat May 4 14:05:58 2013 (r317319) +++ head/www/midori/Makefile Sat May 4 14:06:08 2013 (r317320) @@ -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 Modified: head/www/node04/Makefile ============================================================================== --- head/www/node04/Makefile Sat May 4 14:05:58 2013 (r317319) +++ head/www/node04/Makefile Sat May 4 14:06:08 2013 (r317320) @@ -43,9 +43,7 @@ EXTRA_PATCHES= ${FILESDIR}/extra-patch-s 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) Modified: head/www/node06/Makefile ============================================================================== --- head/www/node06/Makefile Sat May 4 14:05:58 2013 (r317319) +++ head/www/node06/Makefile Sat May 4 14:06:08 2013 (r317320) @@ -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> Modified: head/x11-toolkits/flowcanvas/Makefile ============================================================================== --- head/x11-toolkits/flowcanvas/Makefile Sat May 4 14:05:58 2013 (r317319) +++ head/x11-toolkits/flowcanvas/Makefile Sat May 4 14:06:08 2013 (r317320) @@ -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 \ Modified: head/x11-wm/ede/Makefile ============================================================================== --- head/x11-wm/ede/Makefile Sat May 4 14:05:58 2013 (r317319) +++ head/x11-wm/ede/Makefile Sat May 4 14:06:08 2013 (r317320) @@ -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 \ Modified: head/x11/roxterm/Makefile ============================================================================== --- head/x11/roxterm/Makefile Sat May 4 14:05:58 2013 (r317319) +++ head/x11/roxterm/Makefile Sat May 4 14:06:08 2013 (r317320) @@ -33,9 +33,7 @@ MAITCHFLAGS= CC=${CC};CPP=${CC};CFLAGS=$ .include <bsd.port.options.mk> -.if !defined(DISABLE_MAKE_JOBS) _make_jobs= ${MAKE_JOBS_NUMBER} -.endif post-patch: @${REINPLACE_CMD} -e \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305041406.r44E69Bw096955>