cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

java/openjdk12: correctly patch openjdk12 for ppc64 elfv2

Browse Source 
The previous patch didn't check for architecture.

PR:		243183
This commit is contained in:
Piotr Kubaj 2020-01-16 13:59:09 +00:00
parent 1159f09aca
commit b3c6e7fecb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=523232
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/openjdk12/Makefile
View File

@ -134,6 +134,9 @@ MAKE_ENV+= USE_CLANG=true
CONFIGURE_ARGS+= --disable-warnings-as-errors \
--disable-dtrace
.endif
.if defined(PPC_ABI) && ${PPC_ABI} == ELFv2
CONFIGURE_ARGS+= --disable-precompiled-headers
.endif
.if ${ARCH} != amd64
CONFIGURE_ARGS+= --enable-aot=no
.endif

13
java/openjdk12/files/patch-make_autoconf_flags-cflags.m4 Normal file
View File

@ -0,0 +1,13 @@
--- make/autoconf/flags-cflags.m4.orig 2020-01-08 09:12:31 UTC
+++ make/autoconf/flags-cflags.m4
@@ -770,6 +770,10 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
# for all archs except arm and ppc, prevent gcc to omit frame pointer
$1_CFLAGS_CPU_JDK="${$1_CFLAGS_CPU_JDK} -fno-omit-frame-pointer"
fi
+ elif test "x$OPENJDK_TARGET_OS_ENV" = xbsd.freebsd; then
+ if test "x$FLAGS_CPU" = xppc64; then
+ $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=powerpc64 -mtune=power5"
+ fi
fi
elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then