diff --git a/java/gradle/Makefile b/java/gradle/Makefile index 3a60ecd3..f2f75b71 100644 --- a/java/gradle/Makefile +++ b/java/gradle/Makefile @@ -2,7 +2,7 @@ # $FreeBSD: head/devel/gradle/Makefile 524011 2020-01-25 05:16:02Z tobik $ PORTNAME= gradle -PORTVERSION= 6.3 #6.1.1 +PORTVERSION= 6.3 CATEGORIES= devel java MASTER_SITES= https://downloads.gradle.org/distributions/ EXTRACT_SUFX= -bin.zip diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index 90de94b7..c5bf0c26 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -170,7 +170,7 @@ post-patch: -e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \ ${WRKSRC}/make/autoconf/libraries.m4 -PLIST= ${PKGDIR}/plist.${ARCH} +PLIST= ${PKGDIR}/pkg-plist.${ARCH} SUB_LIST+= PREFIX=${PREFIX} SUB_LIST+= PORTNAME=${PORTNAME}${PKGNAMESUFFIX} diff --git a/java/openjdk11/plist.amd64 b/java/openjdk11/pkg-plist.amd64 similarity index 100% rename from java/openjdk11/plist.amd64 rename to java/openjdk11/pkg-plist.amd64 diff --git a/java/openjdk12/Makefile b/java/openjdk12/Makefile index ce73e5d0..64824e5a 100644 --- a/java/openjdk12/Makefile +++ b/java/openjdk12/Makefile @@ -63,9 +63,7 @@ NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 12 JDK_MINOR_VERSION= 0 JDK_PATCH_VERSION= 2 - JDK_BUILD_NUMBER= 10 - BSD_JDK_VERSION= 3 GNU_CONFIGURE= yes @@ -174,7 +172,7 @@ SUB_LIST+= PREFIX=${PREFIX} SUB_LIST+= PORTNAME=${PORTNAME}${PKGNAMESUFFIX} SUB_FILES+= man.conf -PLIST= ${PKGDIR}/plist.${ARCH} +PLIST= ${PKGDIR}/pkg-plist.${ARCH} do-install: ${MKDIR} ${STAGEDIR}${INSTALLDIR} diff --git a/java/openjdk12/plist.amd64 b/java/openjdk12/pkg-plist.amd64 similarity index 100% rename from java/openjdk12/plist.amd64 rename to java/openjdk12/pkg-plist.amd64 diff --git a/java/openjdk13/Makefile b/java/openjdk13/Makefile index dfdf3464..f3876547 100644 --- a/java/openjdk13/Makefile +++ b/java/openjdk13/Makefile @@ -66,6 +66,12 @@ JDK_PATCH_VERSION= 1 JDK_BUILD_NUMBER= 9 BSD_JDK_VERSION= 1 +#JDK_MAJOR_VERSION= 13 +#JDK_MINOR_VERSION= 0 +#JDK_PATCH_VERSION= 2 +#JDK_BUILD_NUMBER= 8 +#BSD_JDK_VERSION= 1 + GNU_CONFIGURE= yes CONFIGURE_ENV= CC=${CC} \ CXX=${CXX} \ @@ -169,7 +175,7 @@ SUB_LIST+= PREFIX=${PREFIX} SUB_LIST+= PORTNAME=${PORTNAME}${PKGNAMESUFFIX} SUB_FILES+= man.conf -PLIST= ${PKGDIR}/plist.${ARCH} +PLIST= ${PKGDIR}/pkg-plist.${ARCH} do-install: ${MKDIR} ${STAGEDIR}${INSTALLDIR} diff --git a/java/openjdk13/plist.amd64 b/java/openjdk13/pkg-plist.amd64 similarity index 100% rename from java/openjdk13/plist.amd64 rename to java/openjdk13/pkg-plist.amd64 diff --git a/java/openjdk14/Makefile b/java/openjdk14/Makefile new file mode 100644 index 00000000..a0031f4d --- /dev/null +++ b/java/openjdk14/Makefile @@ -0,0 +1,202 @@ +# $FreeBSD: head/java/openjdk14/Makefile 528626 2020-03-18 03:33:51Z glewis $ + +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} + +ONLY_FOR_ARCHS= amd64 i386 powerpc64 + +BUILD_DEPENDS+= unzip:arch/unzip +BUILD_DEPENDS+= zip:arch/zip +BUILD_DEPENDS+= ${LOCALBASE}/include/cups/cups.h:print/cups-base +BUILD_DEPENDS+= bash:lang/bash + +LIB_DEPENDS+= libasound.so:media/libalsa +LIB_DEPENDS+= libfontconfig.so:x11/libfontconfig +LIB_DEPENDS+= libfreetype.so:graph/libfreetype2 +LIB_DEPENDS+= libgif.so:graph/libgif +LIB_DEPENDS+= libjpeg.so:graph/libjpeg +LIB_DEPENDS+= libpng.so:graph/libpng + +LIB_DEPENDS+= libX11.so:x11/libX11 +LIB_DEPENDS+= libXext.so:x11/libXext +LIB_DEPENDS+= libXt.so:x11/libXt +LIB_DEPENDS+= libXi.so:x11/libXi +LIB_DEPENDS+= libXtst.so:x11/libXtst +LIB_DEPENDS+= libXrender.so:x11/libXrender +LIB_DEPENDS+= libXrandr.so:x11/libXrandr + +RUN_DEPENDS+= javavm:java/javavmwrapper +RUN_DEPENDS+= xf-dejavu>0:xfont/xf-dejavu + + +USE_GITHUB= yes +GH_ACCOUNT= battleblow +GH_PROJECT= jdk14u + +NO_CCACHE= yes + +USES+= gmake compiler:features pkgconfig + +_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 \ + --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 +CONFIGURE_ARGS+= --disable-dtrace +CONFIGURE_ARGS+= --with-lcms=bundled + + +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 + +#COMPILER_TYPE = clang +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} + + +SUB_LIST+= PREFIX=${PREFIX} +SUB_LIST+= PORTNAME=${PORTNAME}${PKGNAMESUFFIX} +SUB_FILES+= man.conf + +PLIST= ${PKGDIR}/pkg-plist.${ARCH} + +do-install: + ${MKDIR} ${STAGEDIR}${INSTALLDIR} + cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR} + cd ${STAGEDIR}${INSTALLDIR} && \ + ${FIND} bin -type f | ${XARGS} ${CHMOD} ${BINMODE} + ${CHMOD} ${BINMODE} ${STAGEDIR}${INSTALLDIR}/lib/jspawnhelper + ${INSTALL_DATA} ${WRKDIR}/man.conf \ + ${STAGEDIR}${PREFIX}/etc/man.d/${PORTNAME}${PKGNAMESUFFIX}.conf + cd ${STAGEDIR}${INSTALLDIR}/man/man1 && ${GZIP_CMD} *.1 + +.include diff --git a/java/openjdk14/distinfo b/java/openjdk14/distinfo new file mode 100644 index 00000000..7563cb81 --- /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 00000000..c07b7aba 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 00000000..1722d87b --- /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/man.conf.in b/java/openjdk14/files/man.conf.in new file mode 100644 index 00000000..3729abb4 --- /dev/null +++ b/java/openjdk14/files/man.conf.in @@ -0,0 +1,6 @@ +# +# $Id$ +# +MANPATH %%PREFIX%%/%%PORTNAME%%/man +#EOF + diff --git a/java/openjdk14/files/patch-configure b/java/openjdk14/files/patch-configure new file mode 100644 index 00000000..59daa4ff --- /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 00000000..5156c185 --- /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 00000000..0911464a --- /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_cpu_aarch64_vm__version__aarch64.cpp b/java/openjdk14/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp new file mode 100644 index 00000000..09ab7229 --- /dev/null +++ b/java/openjdk14/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp @@ -0,0 +1,10 @@ +--- src/hotspot/cpu/aarch64/vm_version_aarch64.cpp ++++ src/hotspot/cpu/aarch64/vm_version_aarch64.cpp +@@ -35,6 +35,7 @@ + + #include OS_HEADER_INLINE(os) + ++#ifndef BUILTIN_SIM + #if defined (__linux__) + #include + #include diff --git a/java/openjdk14/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp b/java/openjdk14/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp new file mode 100644 index 00000000..b0410f7b --- /dev/null +++ b/java/openjdk14/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp @@ -0,0 +1,95 @@ +--- src/hotspot/os_cpu/bsd_aarch64/vm_version_bsd_aarch64.cpp ++++ src/hotspot/os_cpu/bsd_aarch64/vm_version_bsd_aarch64.cpp +@@ -25,10 +25,10 @@ + + #include "precompiled.hpp" + #include "runtime/os.hpp" +-#include "runtime/vm_version.hpp" ++#include "vm_version_aarch64.hpp" + +-#if defined (__FreeBSD__) + #include ++#if defined (__FreeBSD__) + #include + #endif + +@@ -76,6 +76,22 @@ + #define ID_AA64PFR0_AdvSIMD_HP (UL(0x1) << ID_AA64PFR0_AdvSIMD_SHIFT) + #endif + ++#ifndef ID_AA64ISAR0_AES_VAL ++#define ID_AA64ISAR0_AES_VAL ID_AA64ISAR0_AES ++#endif ++ ++#ifndef ID_AA64ISAR0_SHA1_VAL ++#define ID_AA64ISAR0_SHA1_VAL ID_AA64ISAR0_SHA1 ++#endif ++ ++#ifndef ID_AA64ISAR0_SHA2_VAL ++#define ID_AA64ISAR0_SHA2_VAL ID_AA64ISAR0_SHA2 ++#endif ++ ++#ifndef ID_AA64ISAR0_CRC32_VAL ++#define ID_AA64ISAR0_CRC32_VAL ID_AA64ISAR0_CRC32 ++#endif ++ + #define CPU_IMPL_ARM 0x41 + #define CPU_IMPL_BROADCOM 0x42 + #define CPU_IMPL_CAVIUM 0x43 +@@ -186,6 +202,17 @@ const struct cpu_implementers cpu_implementers[] = { + CPU_IMPLEMENTER_NONE, + }; + ++#ifdef __OpenBSD__ ++// READ_SPECIALREG is not available from userland on OpenBSD. ++// Hardcode these values to the "lowest common denominator" ++unsigned long VM_Version::os_get_processor_features() { ++ _cpu = CPU_IMPL_ARM; ++ _model = CPU_PART_CORTEX_A53; ++ _variant = 0; ++ _revision = 0; ++ return HWCAP_ASIMD; ++} ++#else + unsigned long VM_Version::os_get_processor_features() { + struct cpu_desc cpu_desc[1]; + struct cpu_desc user_cpu_desc; +@@ -229,26 +256,26 @@ unsigned long VM_Version::os_get_processor_features() { + _model = cpu_desc[cpu].cpu_part_num; + _revision = cpu_desc[cpu].cpu_revision; + +- id_aa64isar0 = READ_SPECIALREG(ID_AA64ISAR0_EL1); +- id_aa64pfr0 = READ_SPECIALREG(ID_AA64PFR0_EL1); ++ id_aa64isar0 = READ_SPECIALREG(id_aa64isar0_el1); ++ id_aa64pfr0 = READ_SPECIALREG(id_aa64pfr0_el1); + +- if (ID_AA64ISAR0_AES(id_aa64isar0) == ID_AA64ISAR0_AES_BASE) { ++ if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) == ID_AA64ISAR0_AES_BASE) { + auxv = auxv | HWCAP_AES; + } + +- if (ID_AA64ISAR0_AES(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL) { ++ if (ID_AA64ISAR0_AES_VAL(id_aa64isar0) == ID_AA64ISAR0_AES_PMULL) { + auxv = auxv | HWCAP_PMULL; + } + +- if (ID_AA64ISAR0_SHA1(id_aa64isar0) == ID_AA64ISAR0_SHA1_BASE) { ++ if (ID_AA64ISAR0_SHA1_VAL(id_aa64isar0) == ID_AA64ISAR0_SHA1_BASE) { + auxv = auxv | HWCAP_SHA1; + } + +- if (ID_AA64ISAR0_SHA2(id_aa64isar0) == ID_AA64ISAR0_SHA2_BASE) { ++ if (ID_AA64ISAR0_SHA2_VAL(id_aa64isar0) == ID_AA64ISAR0_SHA2_BASE) { + auxv = auxv | HWCAP_SHA2; + } + +- if (ID_AA64ISAR0_CRC32(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) { ++ if (ID_AA64ISAR0_CRC32_VAL(id_aa64isar0) == ID_AA64ISAR0_CRC32_BASE) { + auxv = auxv | HWCAP_CRC32; + } + +@@ -259,3 +286,4 @@ unsigned long VM_Version::os_get_processor_features() { + + return auxv; + } ++#endif 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 00000000..8be2abe3 --- /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-deinstall b/java/openjdk14/pkg-deinstall new file mode 100644 index 00000000..dea0ee38 --- /dev/null +++ b/java/openjdk14/pkg-deinstall @@ -0,0 +1,16 @@ +#!/bin/sh + + +PREFIX=${PKG_PREFIX} +LOCALBASE=${PKG_PREFIX} + +set -x + +case $2 in + DEINSTALL) + ;; + POST-DEINSTALL) + ${LOCALBASE}/bin/unregistervm ${PREFIX}/openjdk14/bin/java + ;; +esac +#EOF diff --git a/java/openjdk14/pkg-descr b/java/openjdk14/pkg-descr new file mode 100644 index 00000000..87217803 --- /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-install b/java/openjdk14/pkg-install new file mode 100644 index 00000000..3fea1d3a --- /dev/null +++ b/java/openjdk14/pkg-install @@ -0,0 +1,15 @@ +#!/bin/sh + +PREFIX=${PKG_PREFIX} +LOCALBASE=${PKG_PREFIX} + +set -x + +case $2 in + PRE-INSTALL) + ;; + POST-INSTALL) + ${LOCALBASE}/bin/registervm ${PREFIX}/openjdk14/bin/java + ;; +esac +#EOF diff --git a/java/openjdk14/pkg-message b/java/openjdk14/pkg-message new file mode 100644 index 00000000..2ea3d87d --- /dev/null +++ b/java/openjdk14/pkg-message @@ -0,0 +1,18 @@ +[ +{ type: install + message: <