From 308ce63a846069300b7c75db04db3714a59c217e Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Wed, 18 Mar 2020 03:33:51 +0000 Subject: Add a port of OpenJDK 14 --- java/Makefile | 1 + java/openjdk14/Makefile | 174 +++++++++++++++++++++ java/openjdk14/distinfo | 3 + java/openjdk14/files/cacerts | Bin 0 -> 98310 bytes ...-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp | 11 ++ java/openjdk14/files/patch-configure | 14 ++ .../files/patch-make_autoconf_flags-cflags.m4 | 13 ++ .../files/patch-make_autoconf_libraries.m4 | 15 ++ .../files/patch-src_hotspot_os_bsd_os__bsd.cpp | 11 ++ java/openjdk14/pkg-descr | 3 + java/openjdk14/pkg-message | 18 +++ 11 files changed, 263 insertions(+) create mode 100644 java/openjdk14/Makefile create mode 100644 java/openjdk14/distinfo create mode 100644 java/openjdk14/files/cacerts create mode 100644 java/openjdk14/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp create mode 100644 java/openjdk14/files/patch-configure create mode 100644 java/openjdk14/files/patch-make_autoconf_flags-cflags.m4 create mode 100644 java/openjdk14/files/patch-make_autoconf_libraries.m4 create mode 100644 java/openjdk14/files/patch-src_hotspot_os_bsd_os__bsd.cpp create mode 100644 java/openjdk14/pkg-descr create mode 100644 java/openjdk14/pkg-message diff --git a/java/Makefile b/java/Makefile index b535f6bc83fe..29dbbd185f26 100644 --- a/java/Makefile +++ b/java/Makefile @@ -99,6 +99,7 @@ SUBDIR += openjdk11 SUBDIR += openjdk12 SUBDIR += openjdk13 + SUBDIR += openjdk14 SUBDIR += openjdk7 SUBDIR += openjdk7-jre SUBDIR += openjdk8 diff --git a/java/openjdk14/Makefile b/java/openjdk14/Makefile new file mode 100644 index 000000000000..81abe5518e0e --- /dev/null +++ b/java/openjdk14/Makefile @@ -0,0 +1,174 @@ +# $FreeBSD$ + +PORTNAME= openjdk +DISTVERSIONPREFIX= jdk- +DISTVERSION= ${JDK_MAJOR_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} +CATEGORIES= java devel +PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} + +MAINTAINER= java@FreeBSD.org +COMMENT= Java Development Kit ${JDK_MAJOR_VERSION} + +LICENSE= GPLv2 + +ONLY_FOR_ARCHS= amd64 i386 powerpc64 + +BUILD_DEPENDS= zip:archivers/zip \ + autoconf>0:devel/autoconf \ + ${LOCALBASE}/include/cups/cups.h:print/cups \ + bash:shells/bash +LIB_DEPENDS= libasound.so:audio/alsa-lib \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libgif.so:graphics/giflib \ + liblcms2.so:graphics/lcms2 \ + libpng.so:graphics/png +RUN_DEPENDS= javavm:java/javavmwrapper + +USES= compiler:features gmake iconv jpeg pkgconfig xorg +USE_XORG= x11 xext xi xrandr xrender xt xtst + +USE_GITHUB= yes +GH_ACCOUNT= battleblow +GH_PROJECT= jdk14u + +NO_CCACHE= yes + +_MAKE_JOBS= # +MAKE_ENV= LANG="C" \ + LC_ALL="C" \ + CLASSPATH="" \ + JAVA_HOME="" \ + LD_LIBRARY_PATH="" \ + CC=${CC} \ + CXX=${CXX} \ + CPP=${CPP} \ + MAKEFLAGS="" + +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} + +NOPRECIOUSMAKEVARS= yes + +JDK_MAJOR_VERSION= 14 +JDK_MINOR_VERSION= 0 +JDK_PATCH_VERSION= 0 +JDK_BUILD_NUMBER= 36 +BSD_JDK_VERSION= 1 + +GNU_CONFIGURE= yes +CONFIGURE_ENV= CC=${CC} \ + CXX=${CXX} \ + CPP=${CPP} +CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \ + --disable-ccache \ + --disable-javac-server \ + --disable-hotspot-gtest \ + --with-alsa=${LOCALBASE} \ + --with-cups=${LOCALBASE} \ + --with-fontconfig=${LOCALBASE} \ + --with-freetype=system \ + --with-freetype-include=${LOCALBASE}/include/freetype2 \ + --with-freetype-lib=${LOCALBASE}/lib \ + --with-libjpeg=system \ + --with-giflib=system \ + --with-giflib-include=${LOCALBASE}/include \ + --with-giflib-lib=${LOCALBASE}/lib \ + --with-libpng=system \ + --with-zlib=system \ + --with-lcms=system \ + --x-includes=${LOCALBASE}/include \ + --x-libraries=${LOCALBASE}/lib \ + --with-cacerts-file=${FILESDIR}/cacerts \ + --with-version-string=${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} \ + --with-native-debug-symbols=none \ + --with-debug-level=release + +JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION} + +ALL_TARGET= images +JDK_BUILD_TYPE= release + +.include + +# Support aarch64 on FreeBSD 12 and up +.if ${OSVERSION} >= 1200500 +ONLY_FOR_ARCHS+=aarch64 +.endif + +BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk14 \ + ${LOCALBASE}/openjdk13 + +# do we have valid native jdk installed? +.for BJDK in ${BOOTSTRAP_JDKS} +. if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac) +BOOTSTRAPJDKDIR= ${BJDK} +. endif +.endfor + +# if no valid jdk found, set dependency +.if !defined(BOOTSTRAPJDKDIR) +BOOTSTRAPJDKDIR?= ${LOCALBASE}/openjdk13 +BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk13 +.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+= --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 || ${ARCH} == powerpc64 +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 +.if ${ARCH} == powerpc64 && ${OSREL:C/\.[0-9]//} == 12 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp +.endif + +.if empty(ICONV_LIB) +ICONV_CFLAGS= -DLIBICONV_PLUG +.else +ICONV_CFLAGS= -I${LOCALBASE}/include +ICONV_LDFLAGS= -L${LOCALBASE}/lib +ICONV_LIBS= ${ICONV_LIB} +.endif + +post-patch: + @${FIND} ${WRKSRC} -name '*.orig' -delete + @${CHMOD} 755 ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/configure \ + ${WRKSRC}/src/hotspot/os/bsd/os_bsd.cpp + @${REINPLACE_CMD} -e 's|%%ICONV_CFLAGS%%|${ICONV_CFLAGS}|' \ + -e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \ + -e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \ + ${WRKSRC}/make/autoconf/libraries.m4 + +do-install: + @${MKDIR} ${STAGEDIR}${INSTALLDIR} + @cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR} + @cd ${STAGEDIR}${INSTALLDIR} && \ + ${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \; + @${CHMOD} ${BINMODE} ${STAGEDIR}${INSTALLDIR}/lib/jspawnhelper + @${ECHO} "@javavm ${INSTALLDIR}/bin/java" >> ${TMPPLIST} + @${FIND} ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \ + ${SED} -e 's|^${STAGEDIR}${PREFIX}/||' >> ${TMPPLIST} + +.include diff --git a/java/openjdk14/distinfo b/java/openjdk14/distinfo new file mode 100644 index 000000000000..7563cb815e41 --- /dev/null +++ b/java/openjdk14/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1584500454 +SHA256 (battleblow-jdk14u-jdk-14+36-1_GH0.tar.gz) = 13d7b9b3e2669a889a268b74b93e99a39e3b6ba9f9d90b90fb000f4c6033126a +SIZE (battleblow-jdk14u-jdk-14+36-1_GH0.tar.gz) = 109384778 diff --git a/java/openjdk14/files/cacerts b/java/openjdk14/files/cacerts new file mode 100644 index 000000000000..c07b7abaf5ef Binary files /dev/null and b/java/openjdk14/files/cacerts differ diff --git a/java/openjdk14/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp b/java/openjdk14/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp new file mode 100644 index 000000000000..1722d87b9665 --- /dev/null +++ b/java/openjdk14/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp @@ -0,0 +1,11 @@ +--- src/hotspot/cpu/ppc/vm_version_ppc.hpp.orig 2019-10-16 11:31:09.000000000 -0700 ++++ src/hotspot/cpu/ppc/vm_version_ppc.hpp 2019-10-23 12:54:06.972903000 -0700 +@@ -108,7 +108,7 @@ + static bool has_lqarx() { return (_features & lqarx_m) != 0; } + static bool has_vcipher() { return (_features & vcipher_m) != 0; } + static bool has_vpmsumb() { return (_features & vpmsumb_m) != 0; } +- static bool has_mfdscr() { return (_features & mfdscr_m) != 0; } ++ static bool has_mfdscr() { return false; } + static bool has_vsx() { return (_features & vsx_m) != 0; } + static bool has_ldbrx() { return (_features & ldbrx_m) != 0; } + static bool has_stdbrx() { return (_features & stdbrx_m) != 0; } diff --git a/java/openjdk14/files/patch-configure b/java/openjdk14/files/patch-configure new file mode 100644 index 000000000000..59daa4ff854f --- /dev/null +++ b/java/openjdk14/files/patch-configure @@ -0,0 +1,14 @@ +--- configure.orig 2019-03-12 12:38:39.648907000 -0700 ++++ configure 2019-03-12 12:39:04.275572000 -0700 +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!%%LOCALBASE%%/bin/bash + # + # Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +@@ -32,4 +32,4 @@ + # Delegate to wrapper, forcing wrapper to believe $0 is this script by using -c. + # This trick is needed to get autoconf to co-operate properly. + # The ${-:+-$-} construction passes on bash options. +-bash ${-:+-$-} -c ". $this_script_dir/make/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@" ++%%LOCALBASE%%/bin/bash ${-:+-$-} -c ". $this_script_dir/make/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@" diff --git a/java/openjdk14/files/patch-make_autoconf_flags-cflags.m4 b/java/openjdk14/files/patch-make_autoconf_flags-cflags.m4 new file mode 100644 index 000000000000..5156c18515da --- /dev/null +++ b/java/openjdk14/files/patch-make_autoconf_flags-cflags.m4 @@ -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 diff --git a/java/openjdk14/files/patch-make_autoconf_libraries.m4 b/java/openjdk14/files/patch-make_autoconf_libraries.m4 new file mode 100644 index 000000000000..0911464a6522 --- /dev/null +++ b/java/openjdk14/files/patch-make_autoconf_libraries.m4 @@ -0,0 +1,15 @@ +--- make/autoconf/libraries.m4~ 2019-08-12 19:10:36.292217000 -0700 ++++ make/autoconf/libraries.m4 2019-08-12 19:18:15.523606000 -0700 +@@ -188,9 +188,9 @@ + ICONV_LDFLAGS="-L/usr/local/lib" + ICONV_LIBS=-liconv + elif test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then +- ICONV_CFLAGS=-DLIBICONV_PLUG +- ICONV_LDFLAGS= +- ICONV_LIBS= ++ ICONV_CFLAGS=%%ICONV_CFLAGS%% ++ ICONV_LDFLAGS=%%ICONV_LDFLAGS%% ++ ICONV_LIBS=%%ICONV_LIBS%% + else + ICONV_CFLAGS= + ICONV_LDFLAGS= diff --git a/java/openjdk14/files/patch-src_hotspot_os_bsd_os__bsd.cpp b/java/openjdk14/files/patch-src_hotspot_os_bsd_os__bsd.cpp new file mode 100644 index 000000000000..8be2abe3388f --- /dev/null +++ b/java/openjdk14/files/patch-src_hotspot_os_bsd_os__bsd.cpp @@ -0,0 +1,11 @@ +--- src/hotspot/os/bsd/os_bsd.cpp.orig 2019-03-28 21:47:08.000000000 -0700 ++++ src/hotspot/os/bsd/os_bsd.cpp 2019-03-28 23:08:55.590922000 -0700 +@@ -361,7 +361,7 @@ + #elif defined(__NetBSD__) + #define DEFAULT_LIBPATH "/usr/lib:/usr/pkg/lib" + #else +- #define DEFAULT_LIBPATH "/usr/lib:/usr/local/lib" ++ #define DEFAULT_LIBPATH "/usr/lib:%%LOCALBASE%%/lib" + #endif + #else + #define DEFAULT_LIBPATH OVERRIDE_LIBPATH diff --git a/java/openjdk14/pkg-descr b/java/openjdk14/pkg-descr new file mode 100644 index 000000000000..872178038e18 --- /dev/null +++ b/java/openjdk14/pkg-descr @@ -0,0 +1,3 @@ +An open-source implementation of the Java Platform, Standard Edition, + +WWW: https://openjdk.java.net/projects/jdk/14/ diff --git a/java/openjdk14/pkg-message b/java/openjdk14/pkg-message new file mode 100644 index 000000000000..2ea3d87d89c8 --- /dev/null +++ b/java/openjdk14/pkg-message @@ -0,0 +1,18 @@ +[ +{ type: install + message: <