Date: Fri, 27 Sep 2019 15:44:39 +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: r513045 - in head/java: openjdk12 openjdk13 Message-ID: <201909271544.x8RFidq9019504@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Fri Sep 27 15:44:38 2019 New Revision: 513045 URL: https://svnweb.freebsd.org/changeset/ports/513045 Log: Sync with openjdk11 * Separate out platform/compiler concerns * Disable AoT on all arches except amd64 Sponsored by: The FreeBSD Foundation Modified: head/java/openjdk12/Makefile head/java/openjdk13/Makefile Modified: head/java/openjdk12/Makefile ============================================================================== --- head/java/openjdk12/Makefile Fri Sep 27 15:43:22 2019 (r513044) +++ head/java/openjdk12/Makefile Fri Sep 27 15:44:38 2019 (r513045) @@ -122,18 +122,19 @@ 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}" \ +CONFIGURE_ARGS+= --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 ${ARCH} == aarch64 +.if ${ARCH} == aarch64 || ${ARCH} == powerpc64 CONFIGURE_ARGS+= --disable-warnings-as-errors \ --disable-dtrace +.endif +.if ${ARCH} != amd64 +CONFIGURE_ARGS+= --enable-aot=no .endif .if empty(ICONV_LIB) Modified: head/java/openjdk13/Makefile ============================================================================== --- head/java/openjdk13/Makefile Fri Sep 27 15:43:22 2019 (r513044) +++ head/java/openjdk13/Makefile Fri Sep 27 15:44:38 2019 (r513045) @@ -120,18 +120,19 @@ 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}" \ +CONFIGURE_ARGS+= --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 ${ARCH} == aarch64 +.if ${ARCH} == aarch64 || ${ARCH} == powerpc64 CONFIGURE_ARGS+= --disable-warnings-as-errors \ --disable-dtrace +.endif +.if ${ARCH} != amd64 +CONFIGURE_ARGS+= --enable-aot=no .endif .if empty(ICONV_LIB)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909271544.x8RFidq9019504>