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

Collapse All | Expand All

(-)Makefile (-8 / +22 lines)
Lines 37-48 Link Here
37
		CLASSPATH="" \
37
		CLASSPATH="" \
38
		JAVA_HOME="" \
38
		JAVA_HOME="" \
39
		LD_LIBRARY_PATH="" \
39
		LD_LIBRARY_PATH="" \
40
		CC=/usr/bin/cc \
40
		CC=${CC} \
41
		CXX=/usr/bin/c++ \
41
		CXX=${CXX} \
42
		MAKEFLAGS="" \
42
		CPP=${CPP} \
43
		USE_CLANG=true
43
		MAKEFLAGS=""
44
44
45
JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/}
45
JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
46
JDK_BUILDDIR=	${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
46
JDK_BUILDDIR=	${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
47
JDK_IMAGEDIR=	${JDK_BUILDDIR}/images/jdk
47
JDK_IMAGEDIR=	${JDK_BUILDDIR}/images/jdk
48
INSTALLDIR=	${PREFIX}/${PKGBASE}
48
INSTALLDIR=	${PREFIX}/${PKGBASE}
Lines 56-63 Link Here
56
BSD_JDK_VERSION=	2
56
BSD_JDK_VERSION=	2
57
57
58
GNU_CONFIGURE=	yes
58
GNU_CONFIGURE=	yes
59
CONFIGURE_ENV=	CC=/usr/bin/cc \
59
CONFIGURE_ENV=	CC=${CC} \
60
		CXX=/usr/bin/c++
60
		CXX=${CXX} \
61
		CPP=${CPP}
61
CONFIGURE_ARGS=	--with-boot-jdk=${BOOTSTRAPJDKDIR} \
62
CONFIGURE_ARGS=	--with-boot-jdk=${BOOTSTRAPJDKDIR} \
62
		--disable-ccache \
63
		--disable-ccache \
63
		--disable-javac-server \
64
		--disable-javac-server \
Lines 75-81 Link Here
75
		--with-libpng=system \
76
		--with-libpng=system \
76
		--with-zlib=system \
77
		--with-zlib=system \
77
		--with-lcms=system \
78
		--with-lcms=system \
78
		--with-toolchain-type=clang \
79
		--x-includes=${LOCALBASE}/include \
79
		--x-includes=${LOCALBASE}/include \
80
		--x-libraries=${LOCALBASE}/lib \
80
		--x-libraries=${LOCALBASE}/lib \
81
		--with-cacerts-file=${FILESDIR}/cacerts \
81
		--with-cacerts-file=${FILESDIR}/cacerts \
Lines 108-113 Link Here
108
108
109
JDK_BUILD_JVM=	server
109
JDK_BUILD_JVM=	server
110
110
111
MAKE_ENV+=		--with-toolchain-type=${COMPILER_TYPE}
112
CONFIGURE_ARGS+=	--with-toolchain-type=${COMPILER_TYPE}
113
114
.if ${COMPILER_TYPE} == gcc
115
USE_GCC=	yes
116
CONFIGURE_ARGS+=	--disable-warnings-as-errors \
117
			--disable-dtrace \
118
			--with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L/usr/local/lib/gcc${GCC_DEFAULT}" \
119
			--with-extra-cflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \
120
			--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
121
.else
122
MAKE_ENV+=	USE_CLANG=true
123
.endif
124
111
.if empty(ICONV_LIB)
125
.if empty(ICONV_LIB)
112
ICONV_CFLAGS=	-DLIBICONV_PLUG
126
ICONV_CFLAGS=	-DLIBICONV_PLUG
113
.else
127
.else

Return to bug 237208