Date: Fri, 25 Jun 2010 23:34:28 +0200 From: David Naylor <naylor.b.david@gmail.com> To: freebsd-ports@freebsd.org Subject: Re: MAKE_JOBS and openjdk6 Message-ID: <201006252334.32957.naylor.b.david@gmail.com> In-Reply-To: <201006251808.29467.naylor.b.david@gmail.com> References: <201006251808.29467.naylor.b.david@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201006252334.32957.naylor.b.david>