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

Collapse All | Expand All

(-)java/openjdk11/Makefile (-9 / +26 lines)
Lines 12-18 Link Here
12
12
13
LICENSE=	GPLv2
13
LICENSE=	GPLv2
14
14
15
ONLY_FOR_ARCHS=	amd64 i386
15
ONLY_FOR_ARCHS=	amd64 i386 powerpc64
16
16
17
BUILD_DEPENDS=	zip:archivers/zip \
17
BUILD_DEPENDS=	zip:archivers/zip \
18
		autoconf>0:devel/autoconf \
18
		autoconf>0:devel/autoconf \
Lines 36-47 Link Here
36
		CLASSPATH="" \
36
		CLASSPATH="" \
37
		JAVA_HOME="" \
37
		JAVA_HOME="" \
38
		LD_LIBRARY_PATH="" \
38
		LD_LIBRARY_PATH="" \
39
		CC=/usr/bin/cc \
39
		CC=${CC} \
40
		CXX=/usr/bin/c++ \
40
		CXX=${CXX} \
41
		MAKEFLAGS="" \
41
		CPP=${CPP} \
42
		USE_CLANG=true
42
		MAKEFLAGS=""
43
43
44
JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/}
44
JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
45
JDK_BUILDDIR=	${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
45
JDK_BUILDDIR=	${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
46
JDK_IMAGEDIR=	${JDK_BUILDDIR}/images/jdk
46
JDK_IMAGEDIR=	${JDK_BUILDDIR}/images/jdk
47
INSTALLDIR=	${PREFIX}/${PKGBASE}
47
INSTALLDIR=	${PREFIX}/${PKGBASE}
Lines 55-62 Link Here
55
BSD_JDK_VERSION=	4
55
BSD_JDK_VERSION=	4
56
56
57
GNU_CONFIGURE=	yes
57
GNU_CONFIGURE=	yes
58
CONFIGURE_ENV=	CC=/usr/bin/cc \
58
CONFIGURE_ENV=	CC=${CC} \
59
		CXX=/usr/bin/c++
59
		CXX=${CXX} \
60
		CPP=${CPP}
60
CONFIGURE_ARGS=	--with-boot-jdk=${BOOTSTRAPJDKDIR} \
61
CONFIGURE_ARGS=	--with-boot-jdk=${BOOTSTRAPJDKDIR} \
61
		--disable-ccache \
62
		--disable-ccache \
62
		--disable-javac-server \
63
		--disable-javac-server \
Lines 74-80 Link Here
74
		--with-libpng=system \
75
		--with-libpng=system \
75
		--with-zlib=system \
76
		--with-zlib=system \
76
		--with-lcms=system \
77
		--with-lcms=system \
77
		--with-toolchain-type=clang \
78
		--x-includes=${LOCALBASE}/include \
78
		--x-includes=${LOCALBASE}/include \
79
		--x-libraries=${LOCALBASE}/lib \
79
		--x-libraries=${LOCALBASE}/lib \
80
		--with-cacerts-file=${FILESDIR}/cacerts \
80
		--with-cacerts-file=${FILESDIR}/cacerts \
Lines 105-112 Link Here
105
BUILD_DEPENDS+=		${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk11
105
BUILD_DEPENDS+=		${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk11
106
.endif
106
.endif
107
107
108
.if ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == powerpc64
108
JDK_BUILD_JVM=	server
109
JDK_BUILD_JVM=	server
110
.else
111
JDK_BUILD_JVM=	zero
112
LIB_DEPENDS+=	libffi.so:devel/libffi
113
.endif
109
114
115
CONFIGURE_ARGS+=	--with-toolchain-type=${COMPILER_TYPE}
116
117
.if ${ARCH} == powerpc64
118
USE_GCC=	yes
119
CONFIGURE_ARGS+=	--disable-warnings-as-errors \
120
			--disable-dtrace \
121
			--with-log=trace \
122
		--with-extra-ldflags="-Wl,-rpath=/usr/local/lib/gcc${GCC_DEFAULT} -L/usr/local/lib/gcc${GCC_DEFAULT}" \
123
		--with-extra-cflags="-Wl,-rpath=/usr/local/lib/gcc${GCC_DEFAULT}" \
124
		--with-extra-cxxflags="-Wl,-rpath=/usr/local/lib/gcc${GCC_DEFAULT}"
125
.endif
126
110
.if empty(ICONV_LIB)
127
.if empty(ICONV_LIB)
111
ICONV_CFLAGS=	-DLIBICONV_PLUG
128
ICONV_CFLAGS=	-DLIBICONV_PLUG
112
.else
129
.else
(-)java/bootstrap-openjdk11/Makefile (-1 / +1 lines)
Lines 12-18 Link Here
12
12
13
LICENSE=	GPLv2
13
LICENSE=	GPLv2
14
14
15
ONLY_FOR_ARCHS=	amd64 i386
15
ONLY_FOR_ARCHS=	amd64 i386 powerpc64
16
16
17
USES=		tar:xz
17
USES=		tar:xz
18
18
(-)java/bootstrap-openjdk11/distinfo (-5 / +3 lines)
Lines 1-5 Link Here
1
TIMESTAMP = 1553143931
1
TIMESTAMP = 1554745845
2
SHA256 (bootstrap-openjdk11-amd64-11.0.2.9.2.tar.xz) = e53f16a33fca82db960b68ea200b6146eaf8b3ec8b09f5fe1c7711d926d94ffa
2
SHA256 (bootstrap-openjdk11-powerpc64-11.0.2.9.2.tar.xz) = f4b5c770455aff892f7d3dde06b5544a65a8c1b510478cac1674a89e52c574f0
3
SIZE (bootstrap-openjdk11-amd64-11.0.2.9.2.tar.xz) = 102199460
3
SIZE (bootstrap-openjdk11-powerpc64-11.0.2.9.2.tar.xz) = 102464852
4
SHA256 (bootstrap-openjdk11-i386-11.0.2.9.2.tar.xz) = 68b84741d7b8a7241fb30614881f15db3c174d973f999d34e0f53aca6190e00f
5
SIZE (bootstrap-openjdk11-i386-11.0.2.9.2.tar.xz) = 96936056

Return to bug 237208