View | Details | Raw Unified | Return to bug 221897 | Differences between
and this patch

Collapse All | Expand All

(-)java/bootstrap-openjdk/Makefile (-5 / +5 lines)
Lines 17-23 Link Here
17
17
18
BUNDLE_LIBS=	yes
18
BUNDLE_LIBS=	yes
19
19
20
ONLY_FOR_ARCHS=		amd64 armv6 i386 powerpc64
20
ONLY_FOR_ARCHS=		amd64 armv6 armv7 i386 powerpc64
21
BROKEN_powerpc64=	fails to build: pkg-static: Unable to access file jre/lib/powerpc64/jvm.cfg
21
BROKEN_powerpc64=	fails to build: pkg-static: Unable to access file jre/lib/powerpc64/jvm.cfg
22
22
23
DISTINFO_FILE=	${.CURDIR}/distinfo.${JDK_ARCH}
23
DISTINFO_FILE=	${.CURDIR}/distinfo.${JDK_ARCH}
Lines 26-32 Link Here
26
DISTVERSION_i386=	r351880
26
DISTVERSION_i386=	r351880
27
DISTVERSION_powerpc64=	r407937
27
DISTVERSION_powerpc64=	r407937
28
28
29
JDK_ARCH=	${ARCH:C/armv6.*/arm/}
29
JDK_ARCH=	${ARCH:C/armv.*/arm/}
30
JDK_NAME=	openjdk
30
JDK_NAME=	openjdk
31
JDK_ROOT=	bootstrap-${JDK_NAME}
31
JDK_ROOT=	bootstrap-${JDK_NAME}
32
32
Lines 48-66 Link Here
48
48
49
JDK_MASTER_SITES=	LOCAL/jkim
49
JDK_MASTER_SITES=	LOCAL/jkim
50
50
51
.if ${ARCH:Marmv6*}
51
.if ${ARCH:Marmv*}
52
JDK_PORT=	openjdk7
52
JDK_PORT=	openjdk7
53
.else
53
.else
54
JDK_PORT=	openjdk6
54
JDK_PORT=	openjdk6
55
.endif
55
.endif
56
56
57
.if ${ARCH} == "i386"
57
.if ${ARCH} == i386
58
PLIST_SUB+=	CLIENTVM=""
58
PLIST_SUB+=	CLIENTVM=""
59
.else
59
.else
60
PLIST_SUB+=	CLIENTVM="@comment "
60
PLIST_SUB+=	CLIENTVM="@comment "
61
.endif
61
.endif
62
62
63
.if ${ARCH} == "powerpc64"
63
.if ${ARCH} == powerpc64
64
JDK_PORT=	openjdk7
64
JDK_PORT=	openjdk7
65
JDK_NAME=	openjdk
65
JDK_NAME=	openjdk
66
JDK_MASTER_SITES=	LOCAL/glewis/bootstrap-openjdk
66
JDK_MASTER_SITES=	LOCAL/glewis/bootstrap-openjdk

Return to bug 221897