Attachment 204682 Details for Bug 237208 – Changes for openjdk11/Makefile

[patch] Changes for openjdk11/Makefile

Makefile.diff (text/plain), 1.77 KB, created by Greg Lewis on 2019-05-29 06:17:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Lewis

Created: 2019-05-29 06:17:53 UTC

Size: 1.77 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 501834)
>+++ Makefile	(working copy)
>@@ -37,12 +37,12 @@
> 		CLASSPATH="" \
> 		JAVA_HOME="" \
> 		LD_LIBRARY_PATH="" \
>-		CC=/usr/bin/cc \
>-		CXX=/usr/bin/c++ \
>-		MAKEFLAGS="" \
>-		USE_CLANG=true
>+		CC=${CC} \
>+		CXX=${CXX} \
>+		CPP=${CPP} \
>+		MAKEFLAGS=""
> 
>-JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/}
>+JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
> JDK_BUILDDIR=	${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
> JDK_IMAGEDIR=	${JDK_BUILDDIR}/images/jdk
> INSTALLDIR=	${PREFIX}/${PKGBASE}
>@@ -56,8 +56,9 @@
> BSD_JDK_VERSION=	2
> 
> GNU_CONFIGURE=	yes
>-CONFIGURE_ENV=	CC=/usr/bin/cc \
>-		CXX=/usr/bin/c++
>+CONFIGURE_ENV=	CC=${CC} \
>+		CXX=${CXX} \
>+		CPP=${CPP}
> CONFIGURE_ARGS=	--with-boot-jdk=${BOOTSTRAPJDKDIR} \
> 		--disable-ccache \
> 		--disable-javac-server \
>@@ -75,7 +76,6 @@
> 		--with-libpng=system \
> 		--with-zlib=system \
> 		--with-lcms=system \
>-		--with-toolchain-type=clang \
> 		--x-includes=${LOCALBASE}/include \
> 		--x-libraries=${LOCALBASE}/lib \
> 		--with-cacerts-file=${FILESDIR}/cacerts \
>@@ -108,6 +108,20 @@
> 
> JDK_BUILD_JVM=	server
> 
>+MAKE_ENV+=		--with-toolchain-type=${COMPILER_TYPE}
>+CONFIGURE_ARGS+=	--with-toolchain-type=${COMPILER_TYPE}
>+
>+.if ${COMPILER_TYPE} == gcc
>+USE_GCC=	yes
>+CONFIGURE_ARGS+=	--disable-warnings-as-errors \
>+			--disable-dtrace \
>+			--with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L/usr/local/lib/gcc${GCC_DEFAULT}" \
>+			--with-extra-cflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \
>+			--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
>+.else
>+MAKE_ENV+=	USE_CLANG=true
>+.endif
>+
> .if empty(ICONV_LIB)
> ICONV_CFLAGS=	-DLIBICONV_PLUG
> .else

Actions: View | Diff

Attachments on bug 237208: 203597 | 203672 | 203697 | 203698 | 203699 | 204137 | 204157 | 204189 | 204422 | 204682