From owner-freebsd-ports@FreeBSD.ORG Fri Jun 25 21:34:31 2010 Return-Path: Delivered-To: freebsd-ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BE2651065670 for ; Fri, 25 Jun 2010 21:34:31 +0000 (UTC) (envelope-from naylor.b.david@gmail.com) Received: from mail-ww0-f54.google.com (mail-ww0-f54.google.com [74.125.82.54]) by mx1.freebsd.org (Postfix) with ESMTP id 472E98FC0C for ; Fri, 25 Jun 2010 21:34:30 +0000 (UTC) Received: by wwb24 with SMTP id 24so3092764wwb.13 for ; Fri, 25 Jun 2010 14:34:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:organization:to:subject :date:user-agent:references:in-reply-to:mime-version:content-type :content-transfer-encoding:message-id; bh=g8xbaJBw42NbEgU/OB+Ni44fICmtYUh9AuCv3v833tk=; b=sYFXKQ5Q+DsEAfRekooloQsZ6E2w3b7DRUXa9hN5NLYcK+Xs8HzI0p0DpStg0rgFJ4 wSjIQw0K+5fqCKIjdMleVOwY833VcJ8NgtRs/6nuVCMSTD0tFnQ882nPsIGRvdNSMDI/ r1F+gi4ro47mQK+Un4qwLLfSK6wBt+b0yQWts= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:organization:to:subject:date:user-agent:references:in-reply-to :mime-version:content-type:content-transfer-encoding:message-id; b=M3NMGfyPILYfcrxbrTPjHrAAoOTx1EPMv8IX84Fj/L60Kfgv/QUVKMAKQZ4N6erCRx /AWX6GkDOIYWJ4BkccXah8j4AadA8NzW4UBbbo+OKfGekjFWmCQ0SIq4i2bmo9KYf8IH +wHkipYuuwZRHGveW/HQcUTzCvRYxlf+sNwDg= Received: by 10.216.88.211 with SMTP id a61mr1016476wef.65.1277501670118; Fri, 25 Jun 2010 14:34:30 -0700 (PDT) Received: from dragon.dg (41-132-24-150.dsl.mweb.co.za [41.132.24.150]) by mx.google.com with ESMTPS id n52sm495740wee.7.2010.06.25.14.34.24 (version=SSLv3 cipher=RC4-MD5); Fri, 25 Jun 2010 14:34:28 -0700 (PDT) From: David Naylor Organization: Private To: freebsd-ports@freebsd.org Date: Fri, 25 Jun 2010 23:34:28 +0200 User-Agent: KMail/1.13.3 (FreeBSD/9.0-CURRENT; KDE/4.4.3; amd64; ; ) References: <201006251808.29467.naylor.b.david@gmail.com> In-Reply-To: <201006251808.29467.naylor.b.david@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="nextPart3333005.5vZcYH7VeI"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit Message-Id: <201006252334.32957.naylor.b.david@gmail.com> Subject: Re: MAKE_JOBS and openjdk6 X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 25 Jun 2010 21:34:31 -0000 --nextPart3333005.5vZcYH7VeI Content-Type: multipart/mixed; boundary="Boundary-01=_kDSJMMcgsVIDN7a" Content-Transfer-Encoding: 7bit --Boundary-01=_kDSJMMcgsVIDN7a Content-Type: Text/Plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline On Friday 25 June 2010 18:08:22 David Naylor wrote: > Hi, >=20 > java/openjdk6 breaks with FORCE_MAKE_JOBS (it implements its own think).= =20 > The attached patch fixes openjdk6, marks it as MAKE_JOBS_SAFE and makes it > respect MAKE_JOBS_NUMBER. >=20 > Regards, >=20 > David >=20 > P.S. I'm off list Oops. My hack didn't work. =20 With MAKE_JOBS_SAFE _MAKE_JOBS is included but that evaluated to -jN and th= is=20 is choking the Makefile. Is there an easier way to exclude _MAKE_JOBS? =20 Perhaps set _MAKE_JOBS conditionally in bsd.ports.mk and a port can then do= =20 _MAKE_JOBS=3D"" The attached patch fixes the above problem without touching bsd.ports.mk. = =20 Regards --Boundary-01=_kDSJMMcgsVIDN7a Content-Type: text/x-patch; charset="ISO-8859-1"; name="openjdk6.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="openjdk6.diff" diff -ur /usr/ports/java/openjdk6/Makefile openjdk6/Makefile =2D-- /usr/ports/java/openjdk6/Makefile 2010-05-22 03:05:20.000000000 +0200 +++ openjdk6/Makefile 2010-06-25 23:28:24.000000000 +0200 @@ -45,6 +45,7 @@ =20 # java extracts directly to the cwd WRKSRC=3D ${WRKDIR} +MAKE_JOBS_SAFE=3D yes =20 USE_GMAKE=3D yes USE_MOTIF=3D yes @@ -142,8 +143,9 @@ USE_DISPLAY=3D yes .endif =20 =2DBUILD_JOBS_NUMBER!=3D ${SYSCTL} -n kern.smp.cpus =2DMAKE_ENV+=3D HOTSPOT_BUILD_JOBS=3D${BUILD_JOBS_NUMBER} +.if !defined(DISABLE_MAKE_JOBS) +MAKE_ENV+=3D HOTSPOT_BUILD_JOBS=3D${MAKE_JOBS_NUMBER} +.endif =20 COPYDIRS=3D \ hotspot/src/os/linux/launcher \ @@ -210,6 +212,15 @@ ${WRKSRC}/jdk/make/javax/crypto/Makefile .endif =20 +do-build: + @(cd ${BUILD_WRKSRC}; if ! ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} $= {MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}; then \ + if [ x !=3D x${BUILD_FAIL_MESSAGE} ] ; then \ + ${ECHO_MSG} "=3D=3D=3D> Compilation failed unexpectedly."; \ + (${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ + fi; \ + ${FALSE}; \ + fi) + .if defined(WITH_TEST) post-build: @${ECHO_MSG} "" --Boundary-01=_kDSJMMcgsVIDN7a-- --nextPart3333005.5vZcYH7VeI Content-Type: application/pgp-signature; name=signature.asc Content-Description: This is a digitally signed message part. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEABECAAYFAkwlIOgACgkQUaaFgP9pFrJLBwCfR3vtVm2qN9hE2igl6RJCwNSQ yzEAoIswcNXyIyMz1mUVUk94+DOI5wFQ =7QfR -----END PGP SIGNATURE----- --nextPart3333005.5vZcYH7VeI--