mirror of
https://github.com/netbirdio/FreeBSD-ports.git
synced 2026-05-22 18:42:42 -07:00
cleanup: remove expired versions of OpenJDK (12 through 16)
Adjust ports depending on expired versions of OpenJDK: - biology/snpeff: 12+ -> 17+ - devel/RStudio: 12 -> 11 - www/closure-compiler: 13 -> 11+ Allow java/openjdk17 to use java/openjdk17-bootstrap on i386 too, this builds just fine on 13.1-i386 Remove jdk12-doc as it is no longer relevant. Clean up Java version calculations in bsd.java.mk Reviewed by: jwb, java (glewis) Differential Revision: https://reviews.freebsd.org/D35280
This commit is contained in:
Rene Ladan
@@ -17171,3 +17171,9 @@ security/greenbone-security-assistant|security/gsa|2022-05-22|It was splitted in
|
||||
security/py-ospd|security/py-ospd-openvas|2022-05-22|It was merged into security/py-ospd-openvas
|
||||
lang/perl5.30||2022-05-23|Has expired: Support ends three years after .0 release. Please upgrade to a more recent version of Perl
|
||||
sysutils/ansible2||2022-05-23|Has expired: Upstream support ceases
|
||||
java/jdk12-doc||2022-05-24|Only useful for removed java/openjdk12
|
||||
java/openjdk12||2022-05-24|Has expired: EOLed since 30 september 2019
|
||||
java/openjdk13||2022-05-24|Has expired: EOLed since 31 march 2020
|
||||
java/openjdk14||2022-05-24|Has expired: EOLed since 30 september 2020
|
||||
java/openjdk15||2022-05-24|Has expired: EOLed since 31 march 2021
|
||||
java/openjdk16||2022-05-24|Has expired: EOLed since 30 September 2021
|
||||
|
||||
@@ -58,7 +58,7 @@ GL_DEFAULT?= mesa-libs
|
||||
GHOSTSCRIPT_DEFAULT?= agpl
|
||||
# Possible values: 6, 6-nox11, 7, 7-nox11
|
||||
IMAGEMAGICK_DEFAULT?= 7
|
||||
# Possible values: 7, 8, 11, 12, 13, 14, 15, 16, 17, 18
|
||||
# Possible values: 7, 8, 11, 17, 18
|
||||
JAVA_DEFAULT?= 8
|
||||
# Possible values: 2.2.0, 2.3.0
|
||||
. if !defined(WANT_LAZARUS_DEVEL)
|
||||
|
||||
+3
-19
@@ -23,8 +23,7 @@ Java_Include_MAINTAINER= java@FreeBSD.org
|
||||
#
|
||||
# JAVA_VERSION List of space-separated suitable java versions for the
|
||||
# port. An optional "+" allows you to specify a range of
|
||||
# versions. (allowed values: 7[+] 8[+] 11[+] 12[+] 13[+]
|
||||
# 14[+] 15[+] 16[+] 17[+] 18[+])
|
||||
# versions. (allowed values: 7[+] 8[+] 11[+] 17[+] 18[+])
|
||||
#
|
||||
# JAVA_OS List of space-separated suitable JDK port operating systems
|
||||
# for the port. (allowed values: native linux)
|
||||
@@ -161,7 +160,7 @@ SUB_LIST+= JAVA_OS="${JAVA_OS}"
|
||||
. endif
|
||||
|
||||
# The complete list of Java versions, os and vendors supported.
|
||||
__JAVA_VERSION_LIST= 7 8 11 12 13 14 15 16 17 18
|
||||
__JAVA_VERSION_LIST= 7 8 11 17 18
|
||||
_JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
|
||||
_JAVA_OS_LIST= native linux
|
||||
_JAVA_VENDOR_LIST= openjdk oracle
|
||||
@@ -174,16 +173,6 @@ _JAVA_PORT_NATIVE_OPENJDK_JDK_8_INFO= PORT=java/openjdk8 HOME=${LOCALBASE}/op
|
||||
VERSION=8 OS=native VENDOR=openjdk
|
||||
_JAVA_PORT_NATIVE_OPENJDK_JDK_11_INFO= PORT=java/openjdk11 HOME=${LOCALBASE}/openjdk11 \
|
||||
VERSION=11 OS=native VENDOR=openjdk
|
||||
_JAVA_PORT_NATIVE_OPENJDK_JDK_12_INFO= PORT=java/openjdk12 HOME=${LOCALBASE}/openjdk12 \
|
||||
VERSION=12 OS=native VENDOR=openjdk
|
||||
_JAVA_PORT_NATIVE_OPENJDK_JDK_13_INFO= PORT=java/openjdk13 HOME=${LOCALBASE}/openjdk13 \
|
||||
VERSION=13 OS=native VENDOR=openjdk
|
||||
_JAVA_PORT_NATIVE_OPENJDK_JDK_14_INFO= PORT=java/openjdk14 HOME=${LOCALBASE}/openjdk14 \
|
||||
VERSION=14 OS=native VENDOR=openjdk
|
||||
_JAVA_PORT_NATIVE_OPENJDK_JDK_15_INFO= PORT=java/openjdk15 HOME=${LOCALBASE}/openjdk15 \
|
||||
VERSION=15 OS=native VENDOR=openjdk
|
||||
_JAVA_PORT_NATIVE_OPENJDK_JDK_16_INFO= PORT=java/openjdk16 HOME=${LOCALBASE}/openjdk16 \
|
||||
VERSION=16 OS=native VENDOR=openjdk
|
||||
_JAVA_PORT_NATIVE_OPENJDK_JDK_17_INFO= PORT=java/openjdk17 HOME=${LOCALBASE}/openjdk17 \
|
||||
VERSION=17 OS=native VENDOR=openjdk
|
||||
_JAVA_PORT_NATIVE_OPENJDK_JDK_18_INFO= PORT=java/openjdk18 HOME=${LOCALBASE}/openjdk18 \
|
||||
@@ -204,11 +193,6 @@ __JAVA_PORTS_ALL= \
|
||||
JAVA_PORT_NATIVE_OPENJDK_JDK_8 \
|
||||
JAVA_PORT_NATIVE_OPENJDK_JDK_11 \
|
||||
JAVA_PORT_NATIVE_OPENJDK_JDK_17 \
|
||||
JAVA_PORT_NATIVE_OPENJDK_JDK_12 \
|
||||
JAVA_PORT_NATIVE_OPENJDK_JDK_13 \
|
||||
JAVA_PORT_NATIVE_OPENJDK_JDK_14 \
|
||||
JAVA_PORT_NATIVE_OPENJDK_JDK_15 \
|
||||
JAVA_PORT_NATIVE_OPENJDK_JDK_16 \
|
||||
JAVA_PORT_NATIVE_OPENJDK_JDK_18 \
|
||||
JAVA_PORT_NATIVE_OPENJDK_JDK_7 \
|
||||
JAVA_PORT_LINUX_ORACLE_JDK_8
|
||||
@@ -285,7 +269,7 @@ JAVA_RUN= jre
|
||||
. undef _JAVA_PORTS_INSTALLED
|
||||
. undef _JAVA_PORTS_POSSIBLE
|
||||
. if defined(JAVA_VERSION)
|
||||
_JAVA_VERSION= ${JAVA_VERSION:S/^1.7+/1.7 1.8+/:S/^1.8+/1.8 11+/:S/^1.7/7/:S/^1.8/8/:S/^7+/7 8+/:S/^8+/8 11+/:S/^11+/11 12+/:S/^12+/12 13+/:S/^13+/13 14+/:S/^14+/14 15+/:S/^15+/15 16+/:S/^16+/16 17+/:S/^17+/17 18+/:S/^18+/18/}
|
||||
_JAVA_VERSION= ${JAVA_VERSION:S/^1.7+/1.7 1.8+/:S/^1.8+/1.8 11+/:S/^1.7/7/:S/^1.8/8/:S/^7+/7 8+/:S/^8+/8 11+/:S/^11+/11 17+/:S/^17+/17 18+/:S/^18+/18/}
|
||||
. else
|
||||
_JAVA_VERSION= ${__JAVA_VERSION_LIST}
|
||||
. endif
|
||||
|
||||
@@ -16,7 +16,7 @@ RUN_DEPENDS= bash:shells/bash
|
||||
USES= python:3.6+ shebangfix zip
|
||||
USE_JAVA= yes
|
||||
|
||||
JAVA_VERSION= 12+
|
||||
JAVA_VERSION= 17+
|
||||
SHEBANG_FILES= scripts/* scripts/gsa/*
|
||||
|
||||
NO_BUILD= yes
|
||||
|
||||
@@ -40,7 +40,7 @@ server_PKGNAMESUFFIX= -server
|
||||
|
||||
USES= cmake fortran localbase:ldflags pgsql pkgconfig sqlite ssl
|
||||
USE_JAVA= yes
|
||||
JAVA_VERSION= 12 # Java 8 fails on aarch64: Internal Error (assembler_aarch64.hpp:237), pid=1644, tid=0x00000000000c62b6 guarantee(val < (1U << nbits)) failed: Field too big for insn
|
||||
JAVA_VERSION= 11 # Java 8 fails on aarch64: Internal Error (assembler_aarch64.hpp:237), pid=1644, tid=0x00000000000c62b6 guarantee(val < (1U << nbits)) failed: Field too big for insn
|
||||
JAVA_BUILD= yes
|
||||
|
||||
USE_GITHUB= yes
|
||||
|
||||
@@ -58,7 +58,6 @@
|
||||
SUBDIR += jcommon
|
||||
SUBDIR += jd-gui
|
||||
SUBDIR += jdk11-doc
|
||||
SUBDIR += jdk12-doc
|
||||
SUBDIR += jdk8-doc
|
||||
SUBDIR += jdom
|
||||
SUBDIR += jflex
|
||||
@@ -88,11 +87,6 @@
|
||||
SUBDIR += netty
|
||||
SUBDIR += openjdk11
|
||||
SUBDIR += openjdk11-jre
|
||||
SUBDIR += openjdk12
|
||||
SUBDIR += openjdk13
|
||||
SUBDIR += openjdk14
|
||||
SUBDIR += openjdk15
|
||||
SUBDIR += openjdk16
|
||||
SUBDIR += openjdk17
|
||||
SUBDIR += openjdk17-jre
|
||||
SUBDIR += openjdk18
|
||||
|
||||
@@ -1,44 +0,0 @@
|
||||
PORTNAME= jdk
|
||||
PORTVERSION= ${JDK_VERSION}.${JDK_UPDATE_VERSION}.${JDK_PATCH_VERSION}
|
||||
CATEGORIES= java devel
|
||||
MASTER_SITES= #
|
||||
PKGNAMESUFFIX= ${JDK_VERSION}-doc
|
||||
DISTNAME= jdk-${JDK_VERSION}.${JDK_UPDATE_VERSION}.${JDK_PATCH_VERSION}_doc-all
|
||||
|
||||
MAINTAINER= java@FreeBSD.org
|
||||
COMMENT= Java Development Kit ${JDK_VERSION} Documentation
|
||||
|
||||
# Converted from RESTRICTED
|
||||
LICENSE= jdk
|
||||
LICENSE_NAME= jdk
|
||||
LICENSE_TEXT= This documentation is under license and export control.
|
||||
LICENSE_PERMS= auto-accept
|
||||
|
||||
USES= zip
|
||||
|
||||
DOCSDIR?= ${PREFIX}/share/doc/jdk${JDK_VERSION}
|
||||
|
||||
WRKSRC= ${WRKDIR}/docs
|
||||
JDK_VERSION= 12
|
||||
JDK_UPDATE_VERSION= 0
|
||||
JDK_PATCH_VERSION= 2
|
||||
DOWNLOAD_URL= http://www.oracle.com/technetwork/java/javase/downloads/index.html
|
||||
|
||||
NO_BUILD= yes
|
||||
PORTDOCS= *
|
||||
|
||||
OPTIONS_DEFINE= DOCS
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
|
||||
IGNORE=You must manually fetch ${DISTNAME}${EXTRACT_SUFX} from ${DOWNLOAD_URL} by selecting the "Download" link for the "Java SE 12 Documentation", place it in ${DISTDIR} and then run make again
|
||||
.endif
|
||||
|
||||
do-install:
|
||||
@${ECHO} -n ">> Installing documentation in ${DOCSDIR}..."
|
||||
@${MKDIR} ${STAGEDIR}${DOCSDIR}
|
||||
@(cd ${WRKSRC}/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/)
|
||||
@${ECHO} " [ DONE ]"
|
||||
|
||||
.include <bsd.port.post.mk>
|
||||
@@ -1,3 +0,0 @@
|
||||
TIMESTAMP = 1567000674
|
||||
SHA256 (jdk-12.0.2_doc-all.zip) = 8541ec6ff1d78f7e36ea6b5cfcf8cf84b8431ebe67d0f68a1f29fd00debd12aa
|
||||
SIZE (jdk-12.0.2_doc-all.zip) = 51094535
|
||||
@@ -1,6 +0,0 @@
|
||||
Java Development Kit 11 Documentation. Contains release information,
|
||||
API documentation, guides to new features and tool documentation.
|
||||
|
||||
The documentation will be installed in ${PREFIX}/share/doc/jdk12/
|
||||
|
||||
WWW: https://www.oracle.com/java/
|
||||
@@ -1,192 +0,0 @@
|
||||
PORTNAME= openjdk
|
||||
DISTVERSIONPREFIX= jdk-
|
||||
DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
|
||||
PORTREVISION= 4
|
||||
CATEGORIES= java devel
|
||||
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
|
||||
|
||||
MAINTAINER= java@FreeBSD.org
|
||||
COMMENT= Java Development Kit ${JDK_MAJOR_VERSION}
|
||||
|
||||
LICENSE= GPLv2
|
||||
|
||||
ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le
|
||||
|
||||
BUILD_DEPENDS= zip:archivers/zip \
|
||||
autoconf>0:devel/autoconf \
|
||||
${LOCALBASE}/include/cups/cups.h:print/cups \
|
||||
bash:shells/bash \
|
||||
gsed:textproc/gsed
|
||||
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
|
||||
|
||||
DEPRECATED= EOLed since 30 september 2019
|
||||
EXPIRATION_DATE= 2022-05-21
|
||||
|
||||
USES= compiler:features cpe gmake iconv jpeg pkgconfig xorg
|
||||
USE_XORG= x11 xext xi xrandr xrender xt xtst
|
||||
|
||||
CPE_VENDOR= oracle
|
||||
|
||||
USE_GITHUB= yes
|
||||
GH_ACCOUNT= battleblow
|
||||
GH_PROJECT= openjdk-jdk12u
|
||||
|
||||
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= 12
|
||||
JDK_MINOR_VERSION= 0
|
||||
JDK_PATCH_VERSION= 2
|
||||
JDK_BUILD_NUMBER= 10
|
||||
BSD_JDK_VERSION= 4
|
||||
|
||||
JDK_BUG_URL= https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20
|
||||
|
||||
GNU_CONFIGURE= yes
|
||||
CONFIGURE_ENV= CC=${CC} \
|
||||
CXX=${CXX} \
|
||||
CPP=${CPP} \
|
||||
ac_cv_path_SED=${LOCALBASE}/bin/gsed
|
||||
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 \
|
||||
--with-vendor-name="OpenJDK BSD Porting Team" \
|
||||
--with-vendor-url="https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/" \
|
||||
--with-vendor-bug-url="${JDK_BUG_URL}" \
|
||||
--with-vendor-vm-bug-url="${JDK_BUG_URL}"
|
||||
|
||||
JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION}
|
||||
|
||||
ALL_TARGET= images
|
||||
JDK_BUILD_TYPE= release
|
||||
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk12 \
|
||||
${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/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
|
||||
.if ${COMPILER_VERSION} >= 130
|
||||
# PR258954: OpenJDK <= 13 crash due to undefined behavior with clang >= 13
|
||||
# See also https://bugs.openjdk.java.net/browse/JDK-8229258
|
||||
LLVM_VER= 12
|
||||
BUILD_DEPENDS+= clang${LLVM_VER}:devel/llvm${LLVM_VER}
|
||||
CC= ${LOCALBASE}/bin/clang${LLVM_VER}
|
||||
CXX= ${LOCALBASE}/bin/clang++${LLVM_VER}
|
||||
.endif
|
||||
.endif
|
||||
|
||||
.if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*}
|
||||
CONFIGURE_ARGS+= --disable-warnings-as-errors
|
||||
.endif
|
||||
.if ${ARCH} == aarch64 || (defined(PPC_ABI) && ${PPC_ABI} == ELFv1)
|
||||
CONFIGURE_ARGS+= --disable-dtrace
|
||||
.endif
|
||||
.if (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le
|
||||
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 <bsd.port.post.mk>
|
||||
@@ -1,3 +0,0 @@
|
||||
TIMESTAMP = 1587166133
|
||||
SHA256 (battleblow-openjdk-jdk12u-jdk-12.0.2+10-4_GH0.tar.gz) = 4cff87c7eb06005bc7d98705139479e24907f410e1c22163e5df0e3c68868048
|
||||
SIZE (battleblow-openjdk-jdk12u-jdk-12.0.2+10-4_GH0.tar.gz) = 110454275
|
||||
Binary file not shown.
@@ -1,11 +0,0 @@
|
||||
--- 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; }
|
||||
@@ -1,25 +0,0 @@
|
||||
diff --git a/make/common/MakeBase.gmk b/make/common/MakeBase.gmk
|
||||
index 8de519fc606..221e9455960 100644
|
||||
--- make/common/MakeBase.gmk
|
||||
+++ make/common/MakeBase.gmk
|
||||
@@ -525,15 +525,16 @@ DependOnVariableFileName = \
|
||||
# Param 2 - (optional) name of file to store value in
|
||||
DependOnVariableHelper = \
|
||||
$(strip \
|
||||
- $(eval -include $(call DependOnVariableFileName, $1, $2)) \
|
||||
+ $(eval $1_filename := $(call DependOnVariableFileName, $1, $2)) \
|
||||
+ $(if $(wildcard $($1_filename)), $(eval include $($1_filename))) \
|
||||
$(if $(call equals, $(strip $($1)), $(strip $($1_old))),,\
|
||||
- $(call MakeDir, $(dir $(call DependOnVariableFileName, $1, $2))) \
|
||||
+ $(call MakeDir, $(dir $($1_filename))) \
|
||||
$(if $(findstring $(LOG_LEVEL), trace), \
|
||||
$(info NewVariable $1: >$(strip $($1))<) \
|
||||
$(info OldVariable $1: >$(strip $($1_old))<)) \
|
||||
$(call WriteFile, $1_old:=$(call DoubleDollar,$(call EscapeHash,$($1))), \
|
||||
- $(call DependOnVariableFileName, $1, $2))) \
|
||||
- $(call DependOnVariableFileName, $1, $2) \
|
||||
+ $($1_filename))) \
|
||||
+ $($1_filename) \
|
||||
)
|
||||
|
||||
# Main macro
|
||||
@@ -1,44 +0,0 @@
|
||||
changeset: 57932:9e54ea7d9cd9
|
||||
user: qpzhang
|
||||
date: Wed Feb 05 20:31:09 2020 +0800
|
||||
summary: 8238388: libj2gss/NativeFunc.o "multiple definition" link errors with GCC10
|
||||
|
||||
diff -r 932418820c80 -r 9e54ea7d9cd9 src/java.security.jgss/share/native/libj2gss/NativeFunc.c
|
||||
--- src/java.security.jgss/share/native/libj2gss/NativeFunc.c Wed Feb 05 10:45:39 2020 +0100
|
||||
+++ src/java.security.jgss/share/native/libj2gss/NativeFunc.c Wed Feb 05 20:31:09 2020 +0800
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@@ -27,6 +27,9 @@
|
||||
#include <stdlib.h>
|
||||
#include "NativeFunc.h"
|
||||
|
||||
+/* global GSS function table */
|
||||
+GSS_FUNCTION_TABLE_PTR ftab;
|
||||
+
|
||||
/* standard GSS method names (ordering is from mapfile) */
|
||||
static const char RELEASE_NAME[] = "gss_release_name";
|
||||
static const char IMPORT_NAME[] = "gss_import_name";
|
||||
diff -r 932418820c80 -r 9e54ea7d9cd9 src/java.security.jgss/share/native/libj2gss/NativeFunc.h
|
||||
--- src/java.security.jgss/share/native/libj2gss/NativeFunc.h Wed Feb 05 10:45:39 2020 +0100
|
||||
+++ src/java.security.jgss/share/native/libj2gss/NativeFunc.h Wed Feb 05 20:31:09 2020 +0800
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * Copyright (c) 2005, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@@ -277,6 +277,6 @@
|
||||
typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR;
|
||||
|
||||
/* global GSS function table */
|
||||
-GSS_FUNCTION_TABLE_PTR ftab;
|
||||
+extern GSS_FUNCTION_TABLE_PTR ftab;
|
||||
|
||||
#endif
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
changeset: 57994:6925fca95959
|
||||
user: qpzhang
|
||||
date: Tue Feb 04 21:27:10 2020 +0800
|
||||
summary: 8238380: java.base/unix/native/libjava/childproc.c "multiple definition" link errors with GCC10
|
||||
|
||||
diff -r 8f6ffa575f63 -r 6925fca95959 src/java.base/unix/native/libjava/childproc.c
|
||||
--- src/java.base/unix/native/libjava/childproc.c Tue Feb 11 11:17:37 2020 +0800
|
||||
+++ src/java.base/unix/native/libjava/childproc.c Tue Feb 04 21:27:10 2020 +0800
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@@ -34,6 +34,7 @@
|
||||
|
||||
#include "childproc.h"
|
||||
|
||||
+const char * const *parentPathv;
|
||||
|
||||
ssize_t
|
||||
restartableWrite(int fd, const void *buf, size_t count)
|
||||
diff -r 8f6ffa575f63 -r 6925fca95959 src/java.base/unix/native/libjava/childproc.h
|
||||
--- src/java.base/unix/native/libjava/childproc.h Tue Feb 11 11:17:37 2020 +0800
|
||||
+++ src/java.base/unix/native/libjava/childproc.h Tue Feb 04 21:27:10 2020 +0800
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
- * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@@ -126,7 +126,7 @@
|
||||
* The cached and split version of the JDK's effective PATH.
|
||||
* (We don't support putenv("PATH=...") in native code)
|
||||
*/
|
||||
-const char * const *parentPathv;
|
||||
+extern const char * const *parentPathv;
|
||||
|
||||
ssize_t restartableWrite(int fd, const void *buf, size_t count);
|
||||
int restartableDup2(int fd_from, int fd_to);
|
||||
|
||||
@@ -1,23 +0,0 @@
|
||||
commit 34ae46e2bca691f989d4d84129baf545ff8a7469
|
||||
Author: Andrew Haley <aph@openjdk.org>
|
||||
Date: Thu Mar 19 14:53:57 2020 +0000
|
||||
|
||||
8241296: Segfault in JNIHandleBlock::oops_do()
|
||||
|
||||
Reviewed-by: stefank
|
||||
|
||||
diff --git src/hotspot/share/runtime/thread.cpp src/hotspot/share/runtime/thread.cpp
|
||||
index b93e70a0353..b1571f2d594 100644
|
||||
--- src/hotspot/share/runtime/thread.cpp
|
||||
+++ src/hotspot/share/runtime/thread.cpp
|
||||
@@ -888,7 +888,9 @@ bool Thread::claim_par_threads_do(uintx claim_token) {
|
||||
}
|
||||
|
||||
void Thread::oops_do(OopClosure* f, CodeBlobClosure* cf) {
|
||||
- active_handles()->oops_do(f);
|
||||
+ if (active_handles() != NULL) {
|
||||
+ active_handles()->oops_do(f);
|
||||
+ }
|
||||
// Do oop for ThreadShadow
|
||||
f->do_oop((oop*)&_pending_exception);
|
||||
handle_area()->oops_do(f);
|
||||
@@ -1,23 +0,0 @@
|
||||
commit c484d8904285652246c3af212a4211b9a8955149
|
||||
Author: Thomas Stuefe <stuefe@openjdk.org>
|
||||
Date: Tue Mar 16 05:49:01 2021 +0000
|
||||
|
||||
8263557: Possible NULL dereference in Arena::destruct_contents()
|
||||
|
||||
Reviewed-by: kbarrett, coleenp
|
||||
|
||||
diff --git src/hotspot/share/memory/arena.cpp src/hotspot/share/memory/arena.cpp
|
||||
index 8388f68c359..16059bed9be 100644
|
||||
--- src/hotspot/share/memory/arena.cpp
|
||||
+++ src/hotspot/share/memory/arena.cpp
|
||||
@@ -310,7 +310,9 @@ void Arena::destruct_contents() {
|
||||
// reset size before chop to avoid a rare racing condition
|
||||
// that can have total arena memory exceed total chunk memory
|
||||
set_size_in_bytes(0);
|
||||
- _first->chop();
|
||||
+ if (_first != NULL) {
|
||||
+ _first->chop();
|
||||
+ }
|
||||
reset();
|
||||
}
|
||||
|
||||
@@ -1,14 +0,0 @@
|
||||
--- 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 "$@"
|
||||
@@ -1,17 +0,0 @@
|
||||
--- make/autoconf/flags-cflags.m4.orig 2020-01-08 09:12:31 UTC
|
||||
+++ make/autoconf/flags-cflags.m4
|
||||
@@ -770,6 +770,14 @@ 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"
|
||||
+ elif test "x$FLAGS_CPU" = xppc64le; then
|
||||
+ # Little endian machine uses ELFv2 ABI.
|
||||
+ # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI.
|
||||
+ $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=power8 -mtune=power8"
|
||||
+ fi
|
||||
fi
|
||||
|
||||
elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user