Date: Mon, 19 Jul 2010 15:35:36 +0200 From: David Naylor <naylor.b.david@gmail.com> To: Anonymous <swell.k@gmail.com> Cc: freebsd-ports@freebsd.org Subject: Re: MAKE_JOBS and openjdk6 Message-ID: <201007191535.39992.naylor.b.david@gmail.com> In-Reply-To: <86bpayoj2j.fsf@gmail.com> References: <201006251808.29467.naylor.b.david@gmail.com> <201006252334.32957.naylor.b.david@gmail.com> <86bpayoj2j.fsf@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--nextPart2389842.pVXq0fcxMM
Content-Type: multipart/mixed;
boundary="Boundary-01=_oSFRMSffZRqTQc9"
Content-Transfer-Encoding: 7bit
--Boundary-01=_oSFRMSffZRqTQc9
Content-Type: Text/Plain;
charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
On Saturday 26 June 2010 00:15:16 Anonymous wrote:
> David Naylor <naylor.b.david@gmail.com> writes:
> > 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=
).
> >> 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
> >=20
> > Oops. My hack didn't work.
> >=20
> > With MAKE_JOBS_SAFE _MAKE_JOBS is included but that evaluated to -jN and
> > this is choking the Makefile. Is there an easier way to exclude
> > _MAKE_JOBS? Perhaps set _MAKE_JOBS conditionally in bsd.ports.mk and a
> > port can then do _MAKE_JOBS=3D""
> > The attached patch fixes the above problem without touching bsd.ports.m=
k.
>=20
> You can as well define empty _MAKE_JOBS *after* <bsd.port.post.mk>.
> At least it wouldn't be as ugly as redefining do-build target.
>=20
> %%
> Index: java/openjdk6/Makefile
> @@ -266,3 +267,6 @@ post-install:
> @${CAT} ${PKGMESSAGE}
>=20
> .include <bsd.port.post.mk>
> +
> +# XXX: use `?=3D' in bsd.port.mk
> +_MAKE_JOBS=3D
> %%
Yes, I prefer this approach. See attached for the patch that does this. I=
=20
will file a PR about this shortly. =20
Regards
--Boundary-01=_oSFRMSffZRqTQc9
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-07-15 22:29:26.000000000 +0200
+++ openjdk6/Makefile 2010-07-15 22:33:45.000000000 +0200
@@ -48,6 +48,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
@@ -145,8 +146,10 @@
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}
+# XXX: _MAKE_JOBS=3D
+.endif
=20
COPYDIRS=3D \
hotspot/src/os/linux/launcher \
@@ -269,3 +272,5 @@
@${CAT} ${PKGMESSAGE}
=20
.include <bsd.port.post.mk>
+# XXX: use _MAKE_JOBS in bsd.port.mk (and move libe below up-above)
+_MAKE_JOBS=3D
--Boundary-01=_oSFRMSffZRqTQc9--
--nextPart2389842.pVXq0fcxMM
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)
iEYEABECAAYFAkxEVKsACgkQUaaFgP9pFrKs1ACfVu1+dyvp0wGRDNL9arV0q75s
TCUAn1JOieHiY1XleqVPCXiHnykLJceY
=LD9g
-----END PGP SIGNATURE-----
--nextPart2389842.pVXq0fcxMM--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201007191535.39992.naylor.b.david>