diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2019-09-27 23:44:38 +0800 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2019-09-27 23:44:38 +0800 |
| commit | 64cb3efbcfcc1704b686007285ebd48a9acc5d82 (patch) | |
| tree | 04d039a3da5cf1fa740001ae7477c975ff56ed67 /java | |
| parent | 52dc066ad4aebf9d8510cddf5760b5f0cb8ee174 (diff) | |
| download | freebsd-ports-gnome-64cb3efbcfcc1704b686007285ebd48a9acc5d82.tar.gz freebsd-ports-gnome-64cb3efbcfcc1704b686007285ebd48a9acc5d82.tar.zst freebsd-ports-gnome-64cb3efbcfcc1704b686007285ebd48a9acc5d82.zip | |
Sync with openjdk11
* Separate out platform/compiler concerns
* Disable AoT on all arches except amd64
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk12/Makefile | 9 | ||||
| -rw-r--r-- | java/openjdk13/Makefile | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/java/openjdk12/Makefile b/java/openjdk12/Makefile index 3322c6cccb3b..cd076b764487 100644 --- a/java/openjdk12/Makefile +++ b/java/openjdk12/Makefile @@ -122,19 +122,20 @@ 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) ICONV_CFLAGS= -DLIBICONV_PLUG diff --git a/java/openjdk13/Makefile b/java/openjdk13/Makefile index 6998c926b864..e1743aabb3bd 100644 --- a/java/openjdk13/Makefile +++ b/java/openjdk13/Makefile @@ -120,19 +120,20 @@ 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) ICONV_CFLAGS= -DLIBICONV_PLUG |