Permit building with MAKE_JOBS:

Don't call make -jN, instead pass MAKE_JOBS to HOTSPOT_BUILD_JOBS

ok kurt@, espie@
This commit is contained in:
naddy 2012-09-26 18:23:04 +00:00
parent d67224a84d
commit b854bf5c08
2 changed files with 11 additions and 4 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.32 2012/08/04 15:06:55 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.33 2012/09/26 18:23:04 naddy Exp $
SHARED_ONLY= Yes
ONLY_FOR_ARCHS= amd64 i386
@ -56,6 +56,9 @@ WANTLIB= X11 Xext Xi Xtst c m ossaudio pthread \
USE_GMAKE= Yes
USE_GROFF = Yes
# Don't call make -jN, instead pass MAKE_JOBS to HOTSPOT_BUILD_JOBS
PARALLEL_BUILD= No
TAR= ${LOCALBASE}/bin/gtar
MAKE_ENV= ALT_MOTIF_DIR="${LOCALBASE}" \
@ -68,7 +71,7 @@ MAKE_ENV= ALT_MOTIF_DIR="${LOCALBASE}" \
CXX="${CXX}" \
DEFAULT_LIBPATH="/usr/lib:${X11BASE}/lib:${LOCALBASE}/lib" \
USER="${USER}" \
HOTSPOT_BUILD_JOBS=${HOTSPOT_BUILD_JOBS}
HOTSPOT_BUILD_JOBS=${MAKE_JOBS}
# Error message for distfile.
FETCH_MANUALLY= "You must manually fetch the distribution files, place"

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.50 2012/08/04 15:06:55 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.51 2012/09/26 18:23:04 naddy Exp $
SHARED_ONLY= Yes
ONLY_FOR_ARCHS= i386 amd64
@ -90,6 +90,10 @@ WANTLIB= X11 Xext Xi Xtst Xrender c freetype m pthread sndio stdc++ z
USE_GMAKE= Yes
# Don't call make -jN, instead pass MAKE_JOBS to HOTSPOT_BUILD_JOBS
PARALLEL_BUILD= No
MAKE_ENV= ALT_BOOTDIR=${ALT_BOOTDIR} \
ALT_FREETYPE_HEADERS_PATH=${X11BASE}/include \
ALT_FREETYPE_LIB_PATH=${X11BASE}/lib \
@ -104,7 +108,7 @@ MAKE_ENV= ALT_BOOTDIR=${ALT_BOOTDIR} \
MILESTONE=fcs \
BUILD_NUMBER=b04 \
JDK_UPDATE_VERSION=03 \
HOTSPOT_BUILD_JOBS=${HOTSPOT_BUILD_JOBS}
HOTSPOT_BUILD_JOBS=${MAKE_JOBS}
#ALL_TARGET= debug_build