From 63f76304d6f21c191cb8e08ab49787bcf031fb6d Mon Sep 17 00:00:00 2001 From: Bryan Drewery Date: Sat, 4 May 2013 14:06:08 +0000 Subject: - 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 With hat: portmgr --- java/openjdk6/Makefile | 4 ---- java/openjdk7/Makefile | 9 +-------- 2 files changed, 1 insertion(+), 12 deletions(-) (limited to 'java') diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile index 8f7201e00d30..44e0f518fd1b 100644 --- a/java/openjdk6/Makefile +++ b/java/openjdk6/Makefile @@ -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} diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile index 1cfabbaed0c6..8f6feb51b8a8 100644 --- a/java/openjdk7/Makefile +++ b/java/openjdk7/Makefile @@ -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 \ -- cgit v1.2.3