Date: Tue, 24 Jun 2008 21:46:00 +1000 From: Peter Jeremy <peterjeremy@optushome.com.au> To: Greg Lewis <glewis@eyesbeyond.com>, freebsd-ports@freebsd.org Subject: Re: Issues with portmaster Message-ID: <20080624114600.GJ91036@server.vk2pj.dyndns.org> In-Reply-To: <20080623221651.GA1188@localhost.my.domain> References: <485DF018.5020703@FreeBSD.org> <485F4B7E.3040905@FreeBSD.org> <485F4EE1.9040603@FreeBSD.org> <485F5582.5040101@FreeBSD.org> <20080623084308.GA51236@wep4017.physik.uni-wuerzburg.de> <485F6585.2040307@FreeBSD.org> <20080623122637.GA51758@wep4017.physik.uni-wuerzburg.de> <485FF948.5080901@FreeBSD.org> <20080623195640.GA99127@misty.eyesbeyond.com> <20080623221651.GA1188@localhost.my.domain>
next in thread | previous in thread | raw e-mail | index | archive | help
--+HP7ph2BbKc20aGI
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
On 2008-Jun-24 00:16:51 +0200, Alexey Shuvaev <shuvaev@physik.uni-wuerzburg=
=2Ede> wrote:
>> >From a partial reading of the email thread, it looks like the simplest
>> thing to do is to just not set BUILD_DEPENDS if it finds an appropriately
>> installed JDK. That way it will only set it if it can't find a bootstrap
>> JDK and it needs one installed.
>>=20
>This is achieved with attached 3-line patch. I have roughly tested it
>with "make -V BUILD_DEPENDS". It produces reasonable results on a system
>with jdk1.5.0 (no dependency on diablo) and on a system without any
>java at all (there is a dependency on diablo).It is trivial, but neverthel=
ess,
>any real battlefield testing (upgrading real systems,
>tinderbox package building)? Review from someone experienced?
>
>Alexey.
>--- Makefile.orig 2008-06-23 10:33:59.000000000 +0200
>+++ Makefile 2008-06-23 10:34:36.000000000 +0200
>@@ -108,9 +108,8 @@
> # if no valid jdk found, set dependency
> .if !defined(BOOTSTRAPJDKDIR)
> BOOTSTRAPJDKDIR?=3D ${LOCALBASE}/diablo-jdk1.5.0
>-.endif
>-
> BUILD_DEPENDS+=3D ${BOOTSTRAPJDKDIR}/bin/javac:${PORTSDIR}/java/diablo-jd=
k15
>+.endif
>=20
> .if defined(WITHOUT_WEB)
> MAKE_ENV+=3D DONT_BUILD_DEPLOY=3D"YES"
With this patch, portmaster successfully upgraded jdk-1.5.0.14p8,1 to
jdk-1.5.0.14p8_2,1, without installing diablo.
--=20
Peter Jeremy
Please excuse any delays as the result of my ISP's inability to implement
an MTA that is either RFC2821-compliant or matches their claimed behaviour.
--+HP7ph2BbKc20aGI
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (FreeBSD)
iEYEARECAAYFAkhg3ngACgkQ/opHv/APuIe2IwCgkBlA0ueki9hHRXmcoTApTusH
IyQAoInhoy05jIbylO2NmN3bUAoWVI+z
=UMEQ
-----END PGP SIGNATURE-----
--+HP7ph2BbKc20aGI--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080624114600.GJ91036>