Attachment #185893 for bug #221896




BUILD_DEPENDS+=	${UNZIP_CMD}:archivers/unzip
.endif

ONLY_FOR_ARCHS=	amd64 armv6 armv7 i386 powerpc powerpc64
WRKSRC=		${WRKDIR}/${PORTNAME}

DOS2UNIX_FILES= jdk/src/bsd/doc/man/appletviewer.1 \

.else
JRE_IMAGEDIR=	${JDK_BUILDDIR}/images/j2re-image
.endif
JDK_JVMDIR=	lib/${ARCH:C/armv.*/arm/:S/powerpc64/ppc64/}
JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/i386/x86/:S/powerpc64/ppc64/}
INSTALLDIR=	${PREFIX}/${PKGBASE}

NO_CCACHE=		yes


OPTIONS_DEFINE=		ALSA POLICY TZUPDATE X11
OPTIONS_DEFINE_armv6=	FPUHACK
OPTIONS_DEFINE_armv7=	FPUHACK
OPTIONS_DEFAULT=	ALSA POLICY TZUPDATE X11
OPTIONS_DEFAULT_armv6=	FPUHACK
OPTIONS_DEFAULT_armv7=	FPUHACK
FPUHACK_DESC=		Hack denormalized numbers in flush-to-zero mode
POLICY_DESC=		Install the Unlimited Strength Policy Files
TZUPDATE_DESC=		Update the time zone data


.include <bsd.port.pre.mk>

.if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == i386
# XXX We must limit max heap size for 32-bit targets.
CONFIGURE_ARGS+=	--with-boot-jdk-jvmargs="-Xmx768m"
MAKE_ENV+=	JAVADOC_CMD_MEM="-Xmx768m"
.endif

.if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == powerpc64
JDK_BUILD_JVM=	server
.else
JDK_BUILD_JVM=	zero


BOOTSTRAP_JDKS=	${LOCALBASE}/openjdk8 \
		${LOCALBASE}/openjdk7
.if ${ARCH} == armv6 || ${ARCH} == armv7
BOOTSTRAP_JDKS+=	${LOCALBASE}/bootstrap-openjdk
.endif



# if no valid jdk found, set dependency
.if !defined(BOOTSTRAPJDKDIR)
.  if ${ARCH} == armv6 || ${ARCH} == armv7
# bootstrap-openjdk is based on openjdk7 and can compile openjdk8
BOOTSTRAPJDKDIR?=	${LOCALBASE}/bootstrap-openjdk
BUILD_DEPENDS+=		${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk

Return to bug 221896

Lines 66-72 Link Here

(-)java/openjdk8/Makefile (-7 / +9 lines)
66	BUILD_DEPENDS+= ${UNZIP_CMD}:archivers/unzip	66	BUILD_DEPENDS+= ${UNZIP_CMD}:archivers/unzip
67	.endif	67	.endif
68		68
69	ONLY_FOR_ARCHS= amd64 armv6 i386 powerpc powerpc64	69	ONLY_FOR_ARCHS= amd64 armv6 armv7 i386 powerpc powerpc64
70	WRKSRC= ${WRKDIR}/${PORTNAME}	70	WRKSRC= ${WRKDIR}/${PORTNAME}
71		71
72	DOS2UNIX_FILES= jdk/src/bsd/doc/man/appletviewer.1 \	72	DOS2UNIX_FILES= jdk/src/bsd/doc/man/appletviewer.1 \
Lines 214-221 Link Here
214	.else	214	.else
215	JRE_IMAGEDIR= ${JDK_BUILDDIR}/images/j2re-image	215	JRE_IMAGEDIR= ${JDK_BUILDDIR}/images/j2re-image
216	.endif	216	.endif
217	JDK_JVMDIR= lib/${ARCH:C/armv6.*/arm/:S/powerpc64/ppc64/}	217	JDK_JVMDIR= lib/${ARCH:C/armv.*/arm/:S/powerpc64/ppc64/}
218	JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:C/armv6.*/arm/:S/i386/x86/:S/powerpc64/ppc64/}	218	JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/i386/x86/:S/powerpc64/ppc64/}
219	INSTALLDIR= ${PREFIX}/${PKGBASE}	219	INSTALLDIR= ${PREFIX}/${PKGBASE}
220		220
221	NO_CCACHE= yes	221	NO_CCACHE= yes
Lines 256-263 Link Here
256		256
257	OPTIONS_DEFINE= ALSA POLICY TZUPDATE X11	257	OPTIONS_DEFINE= ALSA POLICY TZUPDATE X11
258	OPTIONS_DEFINE_armv6= FPUHACK	258	OPTIONS_DEFINE_armv6= FPUHACK
		259	OPTIONS_DEFINE_armv7= FPUHACK
259	OPTIONS_DEFAULT= ALSA POLICY TZUPDATE X11	260	OPTIONS_DEFAULT= ALSA POLICY TZUPDATE X11
260	OPTIONS_DEFAULT_armv6= FPUHACK	261	OPTIONS_DEFAULT_armv6= FPUHACK
		262	OPTIONS_DEFAULT_armv7= FPUHACK
261	FPUHACK_DESC= Hack denormalized numbers in flush-to-zero mode	263	FPUHACK_DESC= Hack denormalized numbers in flush-to-zero mode
262	POLICY_DESC= Install the Unlimited Strength Policy Files	264	POLICY_DESC= Install the Unlimited Strength Policy Files
263	TZUPDATE_DESC= Update the time zone data	265	TZUPDATE_DESC= Update the time zone data
Lines 315-327 Link Here
315		317
316	.include <bsd.port.pre.mk>	318	.include <bsd.port.pre.mk>
317		319
318	.if ${ARCH} == "armv6" \|\| ${ARCH} == "i386"	320	.if ${ARCH} == armv6 \|\| ${ARCH} == armv7 \|\| ${ARCH} == i386
319	# XXX We must limit max heap size for 32-bit targets.	321	# XXX We must limit max heap size for 32-bit targets.
320	CONFIGURE_ARGS+= --with-boot-jdk-jvmargs="-Xmx768m"	322	CONFIGURE_ARGS+= --with-boot-jdk-jvmargs="-Xmx768m"
321	MAKE_ENV+= JAVADOC_CMD_MEM="-Xmx768m"	323	MAKE_ENV+= JAVADOC_CMD_MEM="-Xmx768m"
322	.endif	324	.endif
323		325
324	.if ${ARCH} == "amd64" \|\| ${ARCH} == "i386" \|\| ${ARCH} == "powerpc64"	326	.if ${ARCH} == amd64 \|\| ${ARCH} == i386 \|\| ${ARCH} == powerpc64
325	JDK_BUILD_JVM= server	327	JDK_BUILD_JVM= server
326	.else	328	.else
327	JDK_BUILD_JVM= zero	329	JDK_BUILD_JVM= zero
Lines 330-336 Link Here
330		332
331	BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk8 \	333	BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk8 \
332	${LOCALBASE}/openjdk7	334	${LOCALBASE}/openjdk7
333	.if ${ARCH} == "armv6"	335	.if ${ARCH} == armv6 \|\| ${ARCH} == armv7
334	BOOTSTRAP_JDKS+= ${LOCALBASE}/bootstrap-openjdk	336	BOOTSTRAP_JDKS+= ${LOCALBASE}/bootstrap-openjdk
335	.endif	337	.endif
336		338
Lines 343-349 Link Here
343		345
344	# if no valid jdk found, set dependency	346	# if no valid jdk found, set dependency
345	.if !defined(BOOTSTRAPJDKDIR)	347	.if !defined(BOOTSTRAPJDKDIR)
346	. if ${ARCH} == "armv6"	348	. if ${ARCH} == armv6 \|\| ${ARCH} == armv7
347	# bootstrap-openjdk is based on openjdk7 and can compile openjdk8	349	# bootstrap-openjdk is based on openjdk7 and can compile openjdk8
348	BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk	350	BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk
349	BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk	351	BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk