Date: Fri, 9 Dec 2016 13:42:19 -0700 From: Adam Weinberger <adamw@adamw.org> To: Alan Somers <asomers@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r428241 - in head/java: openjdk7 openjdk8 Message-ID: <138FB883-C7BF-47AF-8FED-E6FC50B57C22@adamw.org> In-Reply-To: <201612092030.uB9KUrnO051491@repo.freebsd.org> References: <201612092030.uB9KUrnO051491@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> On 9 Dec, 2016, at 13:30, Alan Somers <asomers@freebsd.org> wrote: >=20 > Author: asomers (src committer) > Date: Fri Dec 9 20:30:53 2016 > New Revision: 428241 > URL: https://svnweb.freebsd.org/changeset/ports/428241 >=20 > Log: > Add an X11 option to java/openjdk[78] >=20 > It defaults to on. Disabling it will remove X support from Java, and = reduce > X-related dependencies. >=20 > PR: 210000 > Reviewed by: brd > Approved by: brd (ports) > Approved by: glewis (maintainer timeout) > Sponsored by: Spectra Logic Corp > Differential Revision: https://reviews.freebsd.org/D6698 >=20 > Modified: > head/java/openjdk7/Makefile > head/java/openjdk8/Makefile >=20 > Modified: head/java/openjdk7/Makefile > = =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > --- head/java/openjdk7/Makefile Fri Dec 9 20:18:38 2016 = (r428240) > +++ head/java/openjdk7/Makefile Fri Dec 9 20:30:53 2016 = (r428241) > @@ -3,7 +3,7 @@ >=20 > PORTNAME=3D openjdk > PORTVERSION=3D = ${JDK_MAJOR_VERSION}.${PORT_MINOR_VERSION}.${PORT_BUILD_NUMBER} > -PORTREVISION=3D 1 > +PORTREVISION=3D 2 > PORTEPOCH=3D 1 > CATEGORIES=3D java devel > MASTER_SITES=3D = http://download.java.net/openjdk/jdk${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSI= ON}/promoted/b${JDK_BUILD_NUMBER}/ \ > @@ -41,11 +41,25 @@ LICENSE=3D GPLv2 > WRKSRC=3D ${WRKDIR}/${PORTNAME} >=20 > USES=3D compiler dos2unix iconv gmake zip > -USE_XORG+=3D x11 xext xi xrender xt xtst > +# Even when not building with X11 support, openjdk7 requires Xrender, = X11, and > +# Xt headers. > +X11_BUILD_DEPENDS_OFF+=3D = ${LOCALBASE}/libdata/pkgconfig/x11.pc:x11/libX11 > +X11_BUILD_DEPENDS_OFF+=3D = ${LOCALBASE}/libdata/pkgconfig/xext.pc:x11/libXext > +X11_BUILD_DEPENDS_OFF+=3D = ${LOCALBASE}/libdata/pkgconfig/xrender.pc:x11/libXrender > +X11_BUILD_DEPENDS_OFF+=3D = ${LOCALBASE}/libdata/pkgconfig/xt.pc:x11-toolkits/libXt > +# Add more X11 build deps and runtime deps when X11 is enabled > +X11_LIB_DEPENDS+=3D libX11.so.6:x11/libX11 > +X11_LIB_DEPENDS+=3D libXext.so.6:x11/libXext > +X11_LIB_DEPENDS+=3D libXi.so.6:x11/libXi > +X11_LIB_DEPENDS+=3D libXrender.so.1:x11/libXrender > +X11_LIB_DEPENDS+=3D libXt.so.6:x11-toolkits/libXt > +X11_LIB_DEPENDS+=3D libXtst.so.6:x11/libXtst > +X11_MAKE_ENV_OFF=3D BUILD_HEADLESS_ONLY=3D1 Hi Alan, You lose the benefit of USE_XORG here. I think what you're looking for = is: X11_USE=3D XORG=3Dx11,xext,xi,xrender,xt,xtst X11_USE_OFF=3D XORG=3Dx11,xext,xrender,xt # Adam --=20 Adam Weinberger adamw@adamw.org https://www.adamw.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?138FB883-C7BF-47AF-8FED-E6FC50B57C22>