Date: Sun, 25 Aug 2019 20:55:20 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509856 - head/java/openjdk12 Message-ID: <201908252055.x7PKtK8J082236@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Sun Aug 25 20:55:19 2019 New Revision: 509856 URL: https://svnweb.freebsd.org/changeset/ports/509856 Log: Allow the JDK to be compiled with gcc. This is required for powerpc64 support. PR: 237370 Modified: head/java/openjdk12/Makefile Modified: head/java/openjdk12/Makefile ============================================================================== --- head/java/openjdk12/Makefile Sun Aug 25 20:28:47 2019 (r509855) +++ head/java/openjdk12/Makefile Sun Aug 25 20:55:19 2019 (r509856) @@ -41,12 +41,12 @@ MAKE_ENV= LANG="C" \ 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}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE} JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk INSTALLDIR= ${PREFIX}/${PKGBASE} @@ -60,8 +60,9 @@ JDK_BUILD_NUMBER= 10 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 \ @@ -79,7 +80,6 @@ CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \ --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 \ @@ -112,6 +112,20 @@ BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/boo .endif 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908252055.x7PKtK8J082236>