Attachment 185893 Details for Bug 221896 – corrected patch to java/openjdk8

[patch] corrected patch to java/openjdk8

java (text/plain), 2.30 KB, created by Mark Linimon on 2017-08-29 21:12:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Linimon

Created: 2017-08-29 21:12:23 UTC

Size: 2.30 KB

patch

obsolete

>Index: java/openjdk8/Makefile
>===================================================================
>--- java/openjdk8/Makefile	(revision 448901)
>+++ java/openjdk8/Makefile	(working copy)
>@@ -66,7 +66,7 @@
> BUILD_DEPENDS+=	${UNZIP_CMD}:archivers/unzip
> .endif
> 
>-ONLY_FOR_ARCHS=	amd64 armv6 i386 powerpc powerpc64
>+ONLY_FOR_ARCHS=	amd64 armv6 armv7 i386 powerpc powerpc64
> WRKSRC=		${WRKDIR}/${PORTNAME}
> 
> DOS2UNIX_FILES= jdk/src/bsd/doc/man/appletviewer.1 \
>@@ -214,8 +214,8 @@
> .else
> JRE_IMAGEDIR=	${JDK_BUILDDIR}/images/j2re-image
> .endif
>-JDK_JVMDIR=	lib/${ARCH:C/armv6.*/arm/:S/powerpc64/ppc64/}
>-JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:C/armv6.*/arm/:S/i386/x86/:S/powerpc64/ppc64/}
>+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
>@@ -256,8 +256,10 @@
> 
> 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
>@@ -315,13 +317,13 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${ARCH} == "armv6" || ${ARCH} == "i386"
>+.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"
>+.if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == powerpc64
> JDK_BUILD_JVM=	server
> .else
> JDK_BUILD_JVM=	zero
>@@ -330,7 +332,7 @@
> 
> BOOTSTRAP_JDKS=	${LOCALBASE}/openjdk8 \
> 		${LOCALBASE}/openjdk7
>-.if ${ARCH} == "armv6"
>+.if ${ARCH} == armv6 || ${ARCH} == armv7
> BOOTSTRAP_JDKS+=	${LOCALBASE}/bootstrap-openjdk
> .endif
> 
>@@ -343,7 +345,7 @@
> 
> # if no valid jdk found, set dependency
> .if !defined(BOOTSTRAPJDKDIR)
>-.  if ${ARCH} == "armv6"
>+.  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

Actions: View | Diff

Attachments on bug 221896: 185864 | 185893