Index: java/bootstrap-openjdk11/Makefile =================================================================== --- java/bootstrap-openjdk11/Makefile (revision 500583) +++ java/bootstrap-openjdk11/Makefile (working copy) @@ -12,7 +12,7 @@ LICENSE= GPLv2 -ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS= amd64 i386 powerpc64 USES= tar:xz Index: java/bootstrap-openjdk11/distinfo =================================================================== --- java/bootstrap-openjdk11/distinfo (revision 500583) +++ java/bootstrap-openjdk11/distinfo (working copy) @@ -1,5 +1,7 @@ -TIMESTAMP = 1553143931 +TIMESTAMP = 1554745845 SHA256 (bootstrap-openjdk11-amd64-11.0.2.9.2.tar.xz) = e53f16a33fca82db960b68ea200b6146eaf8b3ec8b09f5fe1c7711d926d94ffa SIZE (bootstrap-openjdk11-amd64-11.0.2.9.2.tar.xz) = 102199460 SHA256 (bootstrap-openjdk11-i386-11.0.2.9.2.tar.xz) = 68b84741d7b8a7241fb30614881f15db3c174d973f999d34e0f53aca6190e00f SIZE (bootstrap-openjdk11-i386-11.0.2.9.2.tar.xz) = 96936056 +SHA256 (bootstrap-openjdk11-powerpc64-11.0.2.9.2.tar.xz) = f4b5c770455aff892f7d3dde06b5544a65a8c1b510478cac1674a89e52c574f0 +SIZE (bootstrap-openjdk11-powerpc64-11.0.2.9.2.tar.xz) = 102464852 Index: java/openjdk11/Makefile =================================================================== --- java/openjdk11/Makefile (revision 500583) +++ java/openjdk11/Makefile (working copy) @@ -12,8 +12,11 @@ LICENSE= GPLv2 -ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS= amd64 i386 powerpc64 +PATCH_SITES= https://github.com/battleblow/openjdk-jdk11u/commit/ +PATCHFILES= c4e25a965b5dd79bb975b0301264abbbf5bd1680.patch:-p1 + BUILD_DEPENDS= zip:archivers/zip \ autoconf>0:devel/autoconf \ ${LOCALBASE}/include/cups/cups.h:print/cups \ @@ -36,12 +39,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} @@ -55,8 +58,9 @@ BSD_JDK_VERSION= 1 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 \ @@ -74,7 +78,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 \ @@ -107,6 +110,18 @@ JDK_BUILD_JVM= server +MAKE_ENV+= --with-toolchain-type=${COMPILER_TYPE} + +.if ${ARCH} == powerpc64 +USE_GCC= yes +CONFIGURE_ARGS+= --disable-warnings-as-errors \ + --disable-dtrace \ + --with-log=trace \ + --with-extra-ldflags="-Wl,-rpath=/usr/local/lib/gcc${GCC_DEFAULT} -L/usr/local/lib/gcc${GCC_DEFAULT}" \ + --with-extra-cflags="-Wl,-rpath=/usr/local/lib/gcc${GCC_DEFAULT}" \ + --with-extra-cxxflags="-Wl,-rpath=/usr/local/lib/gcc${GCC_DEFAULT}" +.endif + .if empty(ICONV_LIB) ICONV_CFLAGS= -DLIBICONV_PLUG .else Index: java/openjdk11/distinfo =================================================================== --- java/openjdk11/distinfo (revision 500583) +++ java/openjdk11/distinfo (working copy) @@ -1,3 +1,5 @@ -TIMESTAMP = 1555524590 +TIMESTAMP = 1556703368 SHA256 (jdk-11.0.3+7-1.tar.gz) = 1a75f453c5e819c2399d802a972f9ea6c296208d8fe0b810dad89067e637419c SIZE (jdk-11.0.3+7-1.tar.gz) = 116791459 +SHA256 (c4e25a965b5dd79bb975b0301264abbbf5bd1680.patch) = ddef45ad61e5b974a0c9c18565a1a897ed68e8bcda69f765cbb70d8f6fe690f8 +SIZE (c4e25a965b5dd79bb975b0301264abbbf5bd1680.patch) = 124779