Index: head/java/openjdk11/Makefile =================================================================== --- head/java/openjdk11/Makefile (revision 512380) +++ head/java/openjdk11/Makefile (revision 512381) @@ -1,166 +1,165 @@ # $FreeBSD$ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} -PORTREVISION= 1 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 USE_XORG= x11 xext xi xrandr xrender xt xtst USE_GITHUB= yes GH_ACCOUNT= battleblow GH_PROJECT= openjdk-jdk11u 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}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE} JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk INSTALLDIR= ${PREFIX}/${PKGBASE} NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 11 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 4 -JDK_BUILD_NUMBER= 11 -BSD_JDK_VERSION= 2 +JDK_PATCH_VERSION= 5 +JDK_BUILD_NUMBER= 8 +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}/openjdk11 \ ${LOCALBASE}/bootstrap-openjdk11 # 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}/bootstrap-openjdk11 BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk11 .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${LOCALBASE}/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 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 Index: head/java/openjdk11/distinfo =================================================================== --- head/java/openjdk11/distinfo (revision 512380) +++ head/java/openjdk11/distinfo (revision 512381) @@ -1,3 +1,3 @@ -TIMESTAMP = 1565662004 -SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.4+11-2_GH0.tar.gz) = 15fdeeea8d716620ab78a44e66edf88eeb7707a9b7b389304f2ba6fd39d5fa36 -SIZE (battleblow-openjdk-jdk11u-jdk-11.0.4+11-2_GH0.tar.gz) = 117004198 +TIMESTAMP = 1568931491 +SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.5+8-1_GH0.tar.gz) = f6391881a3739570fd29c64a4ad958061d983f96a69267a8c247ff87421774a7 +SIZE (battleblow-openjdk-jdk11u-jdk-11.0.5+8-1_GH0.tar.gz) = 117115267 Index: head/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp =================================================================== --- head/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp (revision 512380) +++ head/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp (nonexistent) @@ -1,12 +0,0 @@ ---- src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp -+++ src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp -@@ -510,6 +510,9 @@ JVM_handle_bsd_signal(int sig, - // Handle ALL stack overflow variations here - if (sig == SIGSEGV || sig == SIGBUS) { - address addr = (address) info->si_addr; -+#ifdef __FreeBSD__ -+ addr = align_down(addr, os::vm_page_size()); -+#endif - - // check if fault address is within thread stack - if (thread->on_local_stack(addr)) { Property changes on: head/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp =================================================================== --- head/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp (revision 512380) +++ head/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp (nonexistent) @@ -1,61 +0,0 @@ ---- src/hotspot/os_cpu/bsd_aarch64/vm_version_bsd_aarch64.cpp -+++ src/hotspot/os_cpu/bsd_aarch64/vm_version_bsd_aarch64.cpp -@@ -32,6 +32,50 @@ - #include - #endif - -+#ifndef HWCAP_ASIMD -+#define HWCAP_ASIMD (1<<1) -+#endif -+ -+#ifndef HWCAP_AES -+#define HWCAP_AES (1<<3) -+#endif -+ -+#ifndef HWCAP_PMULL -+#define HWCAP_PMULL (1<<4) -+#endif -+ -+#ifndef HWCAP_SHA1 -+#define HWCAP_SHA1 (1<<5) -+#endif -+ -+#ifndef HWCAP_SHA2 -+#define HWCAP_SHA2 (1<<6) -+#endif -+ -+#ifndef HWCAP_CRC32 -+#define HWCAP_CRC32 (1<<7) -+#endif -+ -+#ifndef HWCAP_ATOMICS -+#define HWCAP_ATOMICS (1<<8) -+#endif -+ -+#ifndef ID_AA64PFR0_AdvSIMD_SHIFT -+#define ID_AA64PFR0_AdvSIMD_SHIFT 20 -+#endif -+ -+#ifndef ID_AA64PFR0_AdvSIMD -+#define ID_AA64PFR0_AdvSIMD(x) ((x) & (UL(0xf) << ID_AA64PFR0_AdvSIMD_SHIFT)) -+#endif -+ -+#ifndef ID_AA64PFR0_AdvSIMD_IMPL -+#define ID_AA64PFR0_AdvSIMD_IMPL (UL(0x0) << ID_AA64PFR0_AdvSIMD_SHIFT) -+#endif -+ -+#ifndef ID_AA64PFR0_AdvSIMD_HP -+#define ID_AA64PFR0_AdvSIMD_HP (UL(0x1) << ID_AA64PFR0_AdvSIMD_SHIFT) -+#endif -+ - #define CPU_IMPL_ARM 0x41 - #define CPU_IMPL_BROADCOM 0x42 - #define CPU_IMPL_CAVIUM 0x43 -@@ -113,6 +157,7 @@ - #define CPU_PART(midr) (((midr) >> 4) & 0xfff) - #define CPU_VAR(midr) (((midr) >> 20) & 0xf) - #define CPU_REV(midr) (((midr) >> 0) & 0xf) -+#define UL(x) UINT64_C(x) - - struct cpu_desc { - u_int cpu_impl; Property changes on: head/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__aarch64_vm__version__bsd__aarch64.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/java/openjdk11/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp =================================================================== --- head/java/openjdk11/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp (revision 512380) +++ head/java/openjdk11/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp (nonexistent) @@ -1,13 +0,0 @@ ---- src/hotspot/cpu/aarch64/vm_version_aarch64.cpp -+++ src/hotspot/cpu/aarch64/vm_version_aarch64.cpp -@@ -45,6 +45,10 @@ - #define getauxval(hwcap) 0 - #endif - -+#ifndef HWCAP_ASIMD -+#define HWCAP_ASIMD (1<<1) -+#endif -+ - #ifndef HWCAP_AES - #define HWCAP_AES (1<<3) - #endif Property changes on: head/java/openjdk11/files/patch-src_hotspot_cpu_aarch64_vm__version__aarch64.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_ps__proc.c =================================================================== --- head/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_ps__proc.c (revision 512380) +++ head/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_ps__proc.c (nonexistent) @@ -1,12 +0,0 @@ ---- src/jdk.hotspot.agent/bsd/native/libsaproc/ps_proc.c -+++ src/jdk.hotspot.agent/bsd/native/libsaproc/ps_proc.c -@@ -27,8 +27,8 @@ - #include - #include - #include --#include - #include -+#include - #include - #include - #include Property changes on: head/java/openjdk11/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_ps__proc.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property