freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup: remove expired versions of OpenJDK (12 through 16)

Browse Source 
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
2022-05-21 16:50:57 +02:00
parent 6dc209ad0a
commit c7d1c247d8
85 changed files with 14 additions and 2613 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MOVED
+6
View File
@@ -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
Mk/bsd.default-versions.mk
+1 -1
View File
@@ -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)
Mk/bsd.java.mk
+3 -19
View File
@@ -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
biology/snpeff/Makefile
+1 -1
View File
@@ -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
devel/RStudio/Makefile
+1 -1
View File
@@ -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
java/Makefile
-6
View File
@@ -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
java/jdk12-doc/Makefile
-44
View File
@@ -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>
java/jdk12-doc/distinfo
-3
View File
@@ -1,3 +0,0 @@
TIMESTAMP = 1567000674
SHA256 (jdk-12.0.2_doc-all.zip) = 8541ec6ff1d78f7e36ea6b5cfcf8cf84b8431ebe67d0f68a1f29fd00debd12aa
SIZE (jdk-12.0.2_doc-all.zip) = 51094535
java/jdk12-doc/pkg-descr
-6
View File
@@ -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/
java/openjdk12/Makefile
-192
View File
@@ -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>
java/openjdk12/distinfo
-3
View File
@@ -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
java/openjdk12/files/cacerts
BIN
View File
Binary file not shown.
java/openjdk12/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp
-11
View File
@@ -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; }
java/openjdk12/files/patch-10-af5c725b
-25
View File
@@ -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
java/openjdk12/files/patch-changeset-57932
-44
View File
@@ -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
java/openjdk12/files/patch-changeset-57994
-43
View File
@@ -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);
java/openjdk12/files/patch-commit-34ae46e2bca
-23
View File
@@ -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);
java/openjdk12/files/patch-commit-c484d890428
-23
View File
@@ -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();
}
java/openjdk12/files/patch-configure
-14
View File
@@ -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 "$@"
java/openjdk12/files/patch-make_autoconf_flags-cflags.m4
-17
View File
@@ -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
java/openjdk12/files/patch-make_autoconf_libraries.m4
-15
View File
@@ -1,15 +0,0 @@
--- 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=
java/openjdk12/files/patch-src_hotspot_os__cpu_bsd__ppc_bytes__bsd__ppc.inline.hpp
-20
View File
@@ -1,20 +0,0 @@
--- src/hotspot/os_cpu/bsd_ppc/bytes_bsd_ppc.inline.hpp.orig 2021-03-15 12:55:40 UTC
+++ src/hotspot/os_cpu/bsd_ppc/bytes_bsd_ppc.inline.hpp
@@ -27,13 +27,13 @@
#define OS_CPU_BSD_PPC_VM_BYTES_BSD_PPC_INLINE_HPP
#if defined(VM_LITTLE_ENDIAN)
-#include <byteswap.h>
+#include <sys/endian.h>
// Efficient swapping of data bytes from Java byte
// ordering to native byte ordering and vice versa.
-inline u2 Bytes::swap_u2(u2 x) { return bswap_16(x); }
-inline u4 Bytes::swap_u4(u4 x) { return bswap_32(x); }
-inline u8 Bytes::swap_u8(u8 x) { return bswap_64(x); }
+inline u2 Bytes::swap_u2(u2 x) { return bswap16(x); }
+inline u4 Bytes::swap_u4(u4 x) { return bswap32(x); }
+inline u8 Bytes::swap_u8(u8 x) { return bswap64(x); }
#endif // VM_LITTLE_ENDIAN
#endif // OS_CPU_BSD_PPC_VM_BYTES_BSD_PPC_INLINE_HPP
java/openjdk12/files/patch-src_hotspot_os_bsd_os__bsd.cpp
-11
View File
@@ -1,11 +0,0 @@
--- 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
java/openjdk12/files/patch-src_java.desktop_unix_classes_sun_awt_X11_XlibWrapper.java
-11
View File
@@ -1,11 +0,0 @@
--- src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java.orig 2020-04-17 22:35:42 UTC
+++ src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java
@@ -529,7 +529,7 @@ static native String XSetLocaleModifiers(String modifi
display Specifies the connection to the X server.
onoff Specifies a Boolean value that indicates whether to enable or disable synchronization.
*/
- static native int XSynchronize(long display, boolean onoff);
+ static native long XSynchronize(long display, boolean onoff);
/**
* Extracts an X event that can be processed in a secondary loop.
java/openjdk12/files/patch-src_java.desktop_unix_native_libawt__xawt_xawt_XlibWrapper.c
-15
View File
@@ -1,15 +0,0 @@
--- src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c.orig 2020-04-17 22:35:42 UTC
+++ src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c
@@ -2180,10 +2180,10 @@ Java_sun_awt_X11_XlibWrapper_copyLongArray(JNIEnv *env
}
}
-JNIEXPORT jint JNICALL
+JNIEXPORT jlong JNICALL
Java_sun_awt_X11_XlibWrapper_XSynchronize(JNIEnv *env, jclass clazz, jlong display, jboolean onoff)
{
- return (jint) XSynchronize((Display*)jlong_to_ptr(display), (onoff == JNI_TRUE ? True : False));
+ return ptr_to_jlong(XSynchronize((Display*)jlong_to_ptr(display), (onoff == JNI_TRUE ? True : False)));
}
JNIEXPORT jboolean JNICALL
java/openjdk12/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.c
-20
View File
@@ -1,20 +0,0 @@
--- src/jdk.hotspot.agent/bsd/native/libsaproc/BsdDebuggerLocal.c.orig 2021-03-15 13:24:28 UTC
+++ src/jdk.hotspot.agent/bsd/native/libsaproc/BsdDebuggerLocal.c
@@ -42,7 +42,7 @@
#include "sun_jvm_hotspot_debugger_sparc_SPARCThreadContext.h"
#endif
-#ifdef ppc64
+#if defined(ppc64) || defined(ppc64le)
#include "sun_jvm_hotspot_debugger_ppc64_PPC64ThreadContext.h"
#endif
@@ -326,7 +326,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debu
#if defined(sparc) || defined(sparcv9)
#define NPRGREG sun_jvm_hotspot_debugger_sparc_SPARCThreadContext_NPRGREG
#endif
-#ifdef ppc64
+#if defined(ppc64) || defined(ppc64le)
#define NPRGREG sun_jvm_hotspot_debugger_ppc64_PPC64ThreadContext_NPRGREG
#endif
#ifdef aarch64
java/openjdk12/pkg-descr
-3
View File
@@ -1,3 +0,0 @@
An open-source implementation of the Java Platform, Standard Edition,
WWW: https://openjdk.java.net/
java/openjdk12/pkg-message
-18
View File
@@ -1,18 +0,0 @@
[
{ type: install
message: <<EOM
This OpenJDK implementation requires fdescfs(5) mounted on /dev/fd and
procfs(5) mounted on /proc.
If you have not done it yet, please do the following:
mount -t fdescfs fdesc /dev/fd
mount -t procfs proc /proc
To make it permanent, you need the following lines in /etc/fstab:
fdesc /dev/fd fdescfs rw 0 0
proc /proc procfs rw 0 0
EOM
}
]
java/openjdk13/Makefile
-190
View File
@@ -1,190 +0,0 @@
PORTNAME= openjdk
DISTVERSIONPREFIX= jdk-
DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_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= aarch64 amd64 i386 powerpc64 powerpc64le
DEPRECATED= EOLed since 31 march 2020
EXPIRATION_DATE= 2022-05-21
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
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= jdk13u
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= 13
JDK_MINOR_VERSION= 0
JDK_PATCH_VERSION= 11
JDK_BUILD_NUMBER= 4
BSD_JDK_VERSION= 1
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}/openjdk13 \
${LOCALBASE}/openjdk12
# 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}/openjdk12
BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk12
.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
EXTRA_CFLAGS+= -Wno-unused-but-set-parameter
.if ${COMPILER_VERSION} >= 140
EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical
.endif
CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}"
CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}"
.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>
java/openjdk13/distinfo
-3
View File
@@ -1,3 +0,0 @@
TIMESTAMP = 1651715885
SHA256 (battleblow-jdk13u-jdk-13.0.11+4-1_GH0.tar.gz) = 212da761c081ecca6480ce01f1c1c885cfc6b74ef074c5155abbd5913c0d1487
SIZE (battleblow-jdk13u-jdk-13.0.11+4-1_GH0.tar.gz) = 109380677
java/openjdk13/files/cacerts
BIN
View File
Binary file not shown.
java/openjdk13/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp
-11
View File
@@ -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; }
java/openjdk13/files/patch-configure
-14
View File
@@ -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 "$@"
java/openjdk13/files/patch-make_autoconf_flags-cflags.m4
-13
View File
@@ -1,13 +0,0 @@
--- 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
java/openjdk13/files/patch-make_autoconf_libraries.m4
-15
View File
@@ -1,15 +0,0 @@
--- 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=
java/openjdk13/files/patch-src_hotspot_os_bsd_os__bsd.cpp
-11
View File
@@ -1,11 +0,0 @@
--- 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
java/openjdk13/pkg-descr
-3
View File
@@ -1,3 +0,0 @@
An open-source implementation of the Java Platform, Standard Edition,
WWW: https://openjdk.java.net/projects/jdk/13/
java/openjdk13/pkg-message
-18
View File
@@ -1,18 +0,0 @@
[
{ type: install
message: <<EOM
This OpenJDK implementation requires fdescfs(5) mounted on /dev/fd and
procfs(5) mounted on /proc.
If you have not done it yet, please do the following:
mount -t fdescfs fdesc /dev/fd
mount -t procfs proc /proc
To make it permanent, you need the following lines in /etc/fstab:
fdesc /dev/fd fdescfs rw 0 0
proc /proc procfs rw 0 0
EOM
}
]
java/openjdk14/Makefile
-192
View File
@@ -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= 3
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 \
xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype
DEPRECATED= EOLed since 30 september 2020
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= 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= 2
JDK_BUILD_NUMBER= 12
BSD_JDK_VERSION= 1
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}/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
.if ${COMPILER_VERSION} >= 130
EXTRA_CFLAGS+= -Wno-unused-but-set-parameter
.if ${COMPILER_VERSION} >= 140
EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical
.endif
CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}"
CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}"
.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>
java/openjdk14/distinfo
-3
View File
@@ -1,3 +0,0 @@
TIMESTAMP = 1594880418
SHA256 (battleblow-jdk14u-jdk-14.0.2+12-1_GH0.tar.gz) = ea10926680a669f13bc8f2b778cc5e713d3d109d68fd08986ffd07402d11ba1c
SIZE (battleblow-jdk14u-jdk-14.0.2+12-1_GH0.tar.gz) = 109408470
java/openjdk14/files/cacerts
BIN
View File
Binary file not shown.
java/openjdk14/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp
-11
View File
@@ -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; }
java/openjdk14/files/patch-changeset-57932
-44
View File
@@ -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, 2019, 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
java/openjdk14/files/patch-changeset-57994
-43
View File
@@ -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, 2019, 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);
java/openjdk14/files/patch-commit-c484d890428
-23
View File
@@ -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();
}
java/openjdk14/files/patch-commit-f8a9602a0a6
-28
View File
@@ -1,28 +0,0 @@
commit f8a9602a0a65cdc98eb940aac9529256ded2bf42
Author: Yasumasa Suenaga <ysuenaga@openjdk.org>
Date: Thu Jan 21 06:08:13 2021 +0000
8260025: Missing comma in VM_Version_Ext::_family_id_amd
Reviewed-by: dholmes, stuefe
diff --git src/hotspot/cpu/x86/vm_version_ext_x86.cpp src/hotspot/cpu/x86/vm_version_ext_x86.cpp
index 30d9494c654..a84b37f7977 100644
--- src/hotspot/cpu/x86/vm_version_ext_x86.cpp
+++ src/hotspot/cpu/x86/vm_version_ext_x86.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2021, 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
@@ -739,7 +739,7 @@ const char* const VM_Version_Ext::_family_id_amd[ExtendedFamilyIdLength_AMD] = {
"",
"",
"Opteron/Athlon64",
- "Opteron QC/Phenom" // Barcelona et.al.
+ "Opteron QC/Phenom", // Barcelona et.al.
"",
"",
"",
java/openjdk14/files/patch-configure
-14
View File
@@ -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 "$@"
java/openjdk14/files/patch-make_autoconf_flags-cflags.m4
-17
View File
@@ -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
java/openjdk14/files/patch-make_autoconf_libraries.m4
-15
View File
@@ -1,15 +0,0 @@
--- 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=
java/openjdk14/files/patch-make_lib_Awt2dLibraries.gmk
-11
View File
@@ -1,11 +0,0 @@
--- make/lib/Awt2dLibraries.gmk.orig 2020-07-08 21:33:08 UTC
+++ make/lib/Awt2dLibraries.gmk
@@ -631,7 +631,7 @@ $(eval $(call SetupJdkLibrary, BUILD_LIBFONTMANAGER, \
LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
LDFLAGS_aix := -Wl$(COMMA)-berok, \
LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
- LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
+ LIBS_unix := -lfontconfig -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation \
-framework CoreGraphics, \
LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
java/openjdk14/files/patch-src_hotspot_os__cpu_bsd__ppc_bytes__bsd__ppc.inline.hpp
-20
View File
@@ -1,20 +0,0 @@
--- src/hotspot/os_cpu/bsd_ppc/bytes_bsd_ppc.inline.hpp.orig 2021-03-15 12:55:40 UTC
+++ src/hotspot/os_cpu/bsd_ppc/bytes_bsd_ppc.inline.hpp
@@ -27,13 +27,13 @@
#define OS_CPU_BSD_PPC_VM_BYTES_BSD_PPC_INLINE_HPP
#if defined(VM_LITTLE_ENDIAN)
-#include <byteswap.h>
+#include <sys/endian.h>
// Efficient swapping of data bytes from Java byte
// ordering to native byte ordering and vice versa.
-inline u2 Bytes::swap_u2(u2 x) { return bswap_16(x); }
-inline u4 Bytes::swap_u4(u4 x) { return bswap_32(x); }
-inline u8 Bytes::swap_u8(u8 x) { return bswap_64(x); }
+inline u2 Bytes::swap_u2(u2 x) { return bswap16(x); }
+inline u4 Bytes::swap_u4(u4 x) { return bswap32(x); }
+inline u8 Bytes::swap_u8(u8 x) { return bswap64(x); }
#endif // VM_LITTLE_ENDIAN
#endif // OS_CPU_BSD_PPC_VM_BYTES_BSD_PPC_INLINE_HPP
java/openjdk14/files/patch-src_hotspot_os_bsd_os__bsd.cpp
-11
View File
@@ -1,11 +0,0 @@
--- 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
java/openjdk14/files/patch-src_java.desktop_share_native_libfontmanager_freetypeScaler.c
-209
View File
@@ -1,209 +0,0 @@
--- src/java.desktop/share/native/libfontmanager/freetypeScaler.c.orig 2020-07-08 21:34:01 UTC
+++ src/java.desktop/share/native/libfontmanager/freetypeScaler.c
@@ -43,6 +43,7 @@
#include FT_SYNTHESIS_H
#include FT_LCD_FILTER_H
#include FT_MODULE_H
+#include <fontconfig/fontconfig.h>
#include "fontscaler.h"
@@ -87,6 +88,133 @@ typedef struct FTScalerContext {
int ptsz; /* size in points */
} FTScalerContext;
+typedef struct {
+ FT_Render_Mode ftRenderMode;
+ int ftLoadFlags;
+ FT_LcdFilter ftLcdFilter;
+} RenderingProperties;
+
+static FcPattern* matchedPattern(const FcChar8* family, double ptSize) {
+ FcPattern* pattern = FcPatternCreate();
+ if (!pattern)
+ return 0;
+
+ FcPatternAddString(pattern, FC_FAMILY, family);
+ FcPatternAddBool(pattern, FC_SCALABLE, FcTrue);
+ FcPatternAddDouble(pattern, FC_SIZE, ptSize);
+
+ FcConfigSubstitute(0, pattern, FcMatchPattern);
+ FcDefaultSubstitute(pattern);
+
+ FcResult res;
+ FcPattern *match = FcFontMatch(0, pattern, &res);
+ FcPatternDestroy(pattern);
+ return (res == FcResultMatch) ? match : NULL;
+}
+
+static void readFontconfig(const FcChar8* family, double ptSize, jint aaType, RenderingProperties* rp) {
+ FcPattern *pattern = matchedPattern(family, ptSize);
+
+ FT_Render_Mode ftRenderMode = FT_RENDER_MODE_NORMAL;
+ int ftLoadFlags = FT_LOAD_DEFAULT;
+ FT_LcdFilter ftLcdFilter = FT_LCD_FILTER_DEFAULT;
+ FcBool fcAntialias = 0;
+ char horizontal = 1;
+
+ // subpixel order
+ if (aaType == TEXT_AA_ON)
+ ftRenderMode = FT_RENDER_MODE_NORMAL;
+ else if (aaType == TEXT_AA_OFF)
+ ftRenderMode = FT_RENDER_MODE_MONO;
+ else {
+ int fcRGBA = FC_RGBA_UNKNOWN;
+ if (pattern)
+ FcPatternGetInteger(pattern, FC_RGBA, 0, &fcRGBA);
+ switch (fcRGBA) {
+ case FC_RGBA_NONE:
+ ftRenderMode = FT_RENDER_MODE_NORMAL;
+ break;
+ case FC_RGBA_RGB:
+ case FC_RGBA_BGR:
+ ftRenderMode = FT_RENDER_MODE_LCD;
+ horizontal = 1;
+ break;
+ case FC_RGBA_VRGB:
+ case FC_RGBA_VBGR:
+ ftRenderMode = FT_RENDER_MODE_LCD_V;
+ horizontal = 0;
+ break;
+ default:
+ ftRenderMode = FT_RENDER_MODE_NORMAL;
+ break;
+ }
+ }
+
+ // loading mode
+ if (aaType == TEXT_AA_OFF)
+ ftLoadFlags |= FT_LOAD_TARGET_MONO;
+ else {
+ int fcHintStyle = FC_HINT_NONE;
+ if (pattern)
+ FcPatternGetInteger(pattern, FC_HINT_STYLE, 0, &fcHintStyle);
+ switch (fcHintStyle) {
+ case FC_HINT_NONE:
+ ftLoadFlags |= FT_LOAD_NO_HINTING;
+ break;
+ case FC_HINT_SLIGHT:
+ ftLoadFlags |= FT_LOAD_TARGET_LIGHT;
+ break;
+ case FC_HINT_MEDIUM:
+ ftLoadFlags |= FT_LOAD_TARGET_NORMAL;
+ break;
+ case FC_HINT_FULL:
+ if (aaType == TEXT_AA_ON)
+ ftLoadFlags |= FT_LOAD_TARGET_NORMAL;
+ else
+ ftLoadFlags |= horizontal ? FT_LOAD_TARGET_LCD : FT_LOAD_TARGET_LCD_V;
+ break;
+ default:
+ ftLoadFlags |= FT_LOAD_TARGET_NORMAL;
+ break;
+ }
+ }
+
+ // autohinting
+ FcBool fcAutohint = 0;
+ if (pattern && FcPatternGetBool(pattern, FC_AUTOHINT, 0, &fcAutohint) == FcResultMatch)
+ if (fcAutohint)
+ ftLoadFlags |= FT_LOAD_FORCE_AUTOHINT;
+
+ // LCD filter
+ int fcLCDFilter = FC_LCD_DEFAULT;
+ if (pattern)
+ FcPatternGetInteger(pattern, FC_LCD_FILTER, 0, &fcLCDFilter);
+ switch (fcLCDFilter) {
+ case FC_LCD_NONE:
+ ftLcdFilter = FT_LCD_FILTER_NONE;
+ break;
+ case FC_LCD_DEFAULT:
+ ftLcdFilter = FT_LCD_FILTER_DEFAULT;
+ break;
+ case FC_LCD_LIGHT:
+ ftLcdFilter = FT_LCD_FILTER_LIGHT;
+ break;
+ case FC_LCD_LEGACY:
+ ftLcdFilter = FT_LCD_FILTER_LEGACY;
+ break;
+ default:
+ ftLcdFilter = FT_LCD_FILTER_DEFAULT;
+ break;
+ }
+
+ if (pattern)
+ FcPatternDestroy(pattern);
+
+ rp->ftRenderMode = ftRenderMode;
+ rp->ftLoadFlags = ftLoadFlags;
+ rp->ftLcdFilter = ftLcdFilter;
+}
+
#ifdef DEBUG
/* These are referenced in the freetype sources if DEBUG macro is defined.
To simplify work with debuging version of freetype we define
@@ -868,29 +996,12 @@ static jlong
renderFlags |= FT_LOAD_NO_HINTING;
}
- if (!context->useSbits) {
- renderFlags |= FT_LOAD_NO_BITMAP;
- }
+ RenderingProperties renderingProperties;
+ readFontconfig((const FcChar8 *) scalerInfo->face->family_name,
+ context->ptsz, context->aaType, &renderingProperties);
- /* NB: in case of non identity transform
- we might also prefer to disable transform before hinting,
- and apply it explicitly after hinting is performed.
- Or we can disable hinting. */
-
- /* select appropriate hinting mode */
- if (context->aaType == TEXT_AA_OFF) {
- target = FT_LOAD_TARGET_MONO;
- } else if (context->aaType == TEXT_AA_ON) {
- target = FT_LOAD_TARGET_NORMAL;
- } else if (context->aaType == TEXT_AA_LCD_HRGB ||
- context->aaType == TEXT_AA_LCD_HBGR) {
- target = FT_LOAD_TARGET_LCD;
- } else {
- target = FT_LOAD_TARGET_LCD_V;
- }
- renderFlags |= target;
-
- error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags);
+ FT_Library_SetLcdFilter(scalerInfo->library, renderingProperties.ftLcdFilter);
+ error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags);
if (error) {
//do not destroy scaler yet.
//this can be problem of particular context (e.g. with bad transform)
@@ -915,11 +1026,11 @@ static jlong
glyphInfo = getNullGlyphImage();
return ptr_to_jlong(glyphInfo);
}
- error = FT_Render_Glyph(ftglyph, FT_LOAD_TARGET_MODE(target));
- if (error != 0) {
- return ptr_to_jlong(getNullGlyphImage());
- }
}
+ error = FT_Render_Glyph(ftglyph, renderingProperties.ftRenderMode);
+ if (error != 0) {
+ return ptr_to_jlong(getNullGlyphImage());
+ }
if (renderImage) {
width = (UInt16) ftglyph->bitmap.width;
@@ -1134,9 +1245,11 @@ static FT_Outline* getFTOutline(JNIEnv* env, jobject f
return NULL;
}
- renderFlags = FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP;
+ RenderingProperties renderingProperties;
+ readFontconfig((const FcChar8 *) scalerInfo->face->family_name,
+ context->ptsz, context->aaType, &renderingProperties);
- error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags);
+ error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags);
if (error) {
return NULL;
}
java/openjdk14/files/patch-src_java.desktop_unix_classes_sun_awt_X11_XlibWrapper.java
-11
View File
@@ -1,11 +0,0 @@
--- src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java.orig 2020-04-17 22:35:42 UTC
+++ src/java.desktop/unix/classes/sun/awt/X11/XlibWrapper.java
@@ -529,7 +529,7 @@ static native String XSetLocaleModifiers(String modifi
display Specifies the connection to the X server.
onoff Specifies a Boolean value that indicates whether to enable or disable synchronization.
*/
- static native int XSynchronize(long display, boolean onoff);
+ static native long XSynchronize(long display, boolean onoff);
/**
* Extracts an X event that can be processed in a secondary loop.
java/openjdk14/files/patch-src_java.desktop_unix_native_libawt__xawt_xawt_XlibWrapper.c
-15
View File
@@ -1,15 +0,0 @@
--- src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c.orig 2020-04-17 22:35:42 UTC
+++ src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c
@@ -2180,10 +2180,10 @@ Java_sun_awt_X11_XlibWrapper_copyLongArray(JNIEnv *env
}
}
-JNIEXPORT jint JNICALL
+JNIEXPORT jlong JNICALL
Java_sun_awt_X11_XlibWrapper_XSynchronize(JNIEnv *env, jclass clazz, jlong display, jboolean onoff)
{
- return (jint) XSynchronize((Display*)jlong_to_ptr(display), (onoff == JNI_TRUE ? True : False));
+ return ptr_to_jlong(XSynchronize((Display*)jlong_to_ptr(display), (onoff == JNI_TRUE ? True : False)));
}
JNIEXPORT jboolean JNICALL
java/openjdk14/files/patch-src_jdk.hotspot.agent_bsd_native_libsaproc_BsdDebuggerLocal.cpp
-20
View File
@@ -1,20 +0,0 @@
--- src/jdk.hotspot.agent/bsd/native/libsaproc/BsdDebuggerLocal.cpp.orig 2021-03-15 13:24:28 UTC
+++ src/jdk.hotspot.agent/bsd/native/libsaproc/BsdDebuggerLocal.cpp
@@ -42,7 +42,7 @@
#include "sun_jvm_hotspot_debugger_sparc_SPARCThreadContext.h"
#endif
-#ifdef ppc64
+#if defined(ppc64) || defined(ppc64le)
#include "sun_jvm_hotspot_debugger_ppc64_PPC64ThreadContext.h"
#endif
@@ -326,7 +326,7 @@ JNIEXPORT jlongArray JNICALL Java_sun_jvm_hotspot_debu
#if defined(sparc) || defined(sparcv9)
#define NPRGREG sun_jvm_hotspot_debugger_sparc_SPARCThreadContext_NPRGREG
#endif
-#ifdef ppc64
+#if defined(ppc64) || defined(ppc64le)
#define NPRGREG sun_jvm_hotspot_debugger_ppc64_PPC64ThreadContext_NPRGREG
#endif
#ifdef aarch64
java/openjdk14/pkg-descr
-3
View File
@@ -1,3 +0,0 @@
An open-source implementation of the Java Platform, Standard Edition,
WWW: https://openjdk.java.net/projects/jdk/14/
java/openjdk14/pkg-message
-18
View File
@@ -1,18 +0,0 @@
[
{ type: install
message: <<EOM
This OpenJDK implementation requires fdescfs(5) mounted on /dev/fd and
procfs(5) mounted on /proc.
If you have not done it yet, please do the following:
mount -t fdescfs fdesc /dev/fd
mount -t procfs proc /proc
To make it permanent, you need the following lines in /etc/fstab:
fdesc /dev/fd fdescfs rw 0 0
proc /proc procfs rw 0 0
EOM
}
]
java/openjdk15/Makefile
-191
View File
@@ -1,191 +0,0 @@
PORTNAME= openjdk
DISTVERSIONPREFIX= jdk-
DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_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= 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 \
xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype
DEPRECATED= EOLed since 31 march 2021
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= jdk15u
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= 15
JDK_MINOR_VERSION= 0
JDK_PATCH_VERSION= 7
JDK_BUILD_NUMBER= 4
BSD_JDK_VERSION= 1
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}/openjdk15 \
${LOCALBASE}/openjdk14
# 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}/openjdk14
BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk14
.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
EXTRA_CFLAGS+= -Wno-unused-but-set-parameter
.if ${COMPILER_VERSION} >= 140
EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical
.endif
CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}"
CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}"
.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>
java/openjdk15/distinfo
-3
View File
@@ -1,3 +0,0 @@
TIMESTAMP = 1651717638
SHA256 (battleblow-jdk15u-jdk-15.0.7+4-1_GH0.tar.gz) = 9ef84a0536f4f23d946d639be292afc0b71c3c077d9af9b202221caf8c8c45ca
SIZE (battleblow-jdk15u-jdk-15.0.7+4-1_GH0.tar.gz) = 102248177
java/openjdk15/files/cacerts
BIN
View File
Binary file not shown.
java/openjdk15/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp
-11
View File
@@ -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; }
java/openjdk15/files/patch-configure
-14
View File
@@ -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 "$@"
java/openjdk15/files/patch-make_autoconf_flags-cflags.m4
-13
View File
@@ -1,13 +0,0 @@
--- 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
java/openjdk15/files/patch-make_autoconf_libraries.m4
-15
View File
@@ -1,15 +0,0 @@
--- 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=
java/openjdk15/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk
-11
View File
@@ -1,11 +0,0 @@
--- make/modules/java.desktop/lib/Awt2dLibraries.gmk.orig 2020-07-08 21:33:08 UTC
+++ make/modules/java.desktop/lib/Awt2dLibraries.gmk
@@ -540,7 +540,7 @@
LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
LDFLAGS_aix := -Wl$(COMMA)-berok, \
LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
- LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
+ LIBS_unix := -lfontconfig -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation -framework CoreGraphics, \
LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
$(WIN_AWT_LIB), \
java/openjdk15/files/patch-src_hotspot_os_bsd_os__bsd.cpp
-11
View File
@@ -1,11 +0,0 @@
--- 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
java/openjdk15/files/patch-src_java.desktop_share_native_libfontmanager_freetypeScaler.c
-209
View File
@@ -1,209 +0,0 @@
--- src/java.desktop/share/native/libfontmanager/freetypeScaler.c.orig 2020-07-08 21:34:01 UTC
+++ src/java.desktop/share/native/libfontmanager/freetypeScaler.c
@@ -43,6 +43,7 @@
#include FT_SYNTHESIS_H
#include FT_LCD_FILTER_H
#include FT_MODULE_H
+#include <fontconfig/fontconfig.h>
#include "fontscaler.h"
@@ -87,6 +88,133 @@ typedef struct FTScalerContext {
int ptsz; /* size in points */
} FTScalerContext;
+typedef struct {
+ FT_Render_Mode ftRenderMode;
+ int ftLoadFlags;
+ FT_LcdFilter ftLcdFilter;
+} RenderingProperties;
+
+static FcPattern* matchedPattern(const FcChar8* family, double ptSize) {
+ FcPattern* pattern = FcPatternCreate();
+ if (!pattern)
+ return 0;
+
+ FcPatternAddString(pattern, FC_FAMILY, family);
+ FcPatternAddBool(pattern, FC_SCALABLE, FcTrue);
+ FcPatternAddDouble(pattern, FC_SIZE, ptSize);
+
+ FcConfigSubstitute(0, pattern, FcMatchPattern);
+ FcDefaultSubstitute(pattern);
+
+ FcResult res;
+ FcPattern *match = FcFontMatch(0, pattern, &res);
+ FcPatternDestroy(pattern);
+ return (res == FcResultMatch) ? match : NULL;
+}
+
+static void readFontconfig(const FcChar8* family, double ptSize, jint aaType, RenderingProperties* rp) {
+ FcPattern *pattern = matchedPattern(family, ptSize);
+
+ FT_Render_Mode ftRenderMode = FT_RENDER_MODE_NORMAL;
+ int ftLoadFlags = FT_LOAD_DEFAULT;
+ FT_LcdFilter ftLcdFilter = FT_LCD_FILTER_DEFAULT;
+ FcBool fcAntialias = 0;
+ char horizontal = 1;
+
+ // subpixel order
+ if (aaType == TEXT_AA_ON)
+ ftRenderMode = FT_RENDER_MODE_NORMAL;
+ else if (aaType == TEXT_AA_OFF)
+ ftRenderMode = FT_RENDER_MODE_MONO;
+ else {
+ int fcRGBA = FC_RGBA_UNKNOWN;
+ if (pattern)
+ FcPatternGetInteger(pattern, FC_RGBA, 0, &fcRGBA);
+ switch (fcRGBA) {
+ case FC_RGBA_NONE:
+ ftRenderMode = FT_RENDER_MODE_NORMAL;
+ break;
+ case FC_RGBA_RGB:
+ case FC_RGBA_BGR:
+ ftRenderMode = FT_RENDER_MODE_LCD;
+ horizontal = 1;
+ break;
+ case FC_RGBA_VRGB:
+ case FC_RGBA_VBGR:
+ ftRenderMode = FT_RENDER_MODE_LCD_V;
+ horizontal = 0;
+ break;
+ default:
+ ftRenderMode = FT_RENDER_MODE_NORMAL;
+ break;
+ }
+ }
+
+ // loading mode
+ if (aaType == TEXT_AA_OFF)
+ ftLoadFlags |= FT_LOAD_TARGET_MONO;
+ else {
+ int fcHintStyle = FC_HINT_NONE;
+ if (pattern)
+ FcPatternGetInteger(pattern, FC_HINT_STYLE, 0, &fcHintStyle);
+ switch (fcHintStyle) {
+ case FC_HINT_NONE:
+ ftLoadFlags |= FT_LOAD_NO_HINTING;
+ break;
+ case FC_HINT_SLIGHT:
+ ftLoadFlags |= FT_LOAD_TARGET_LIGHT;
+ break;
+ case FC_HINT_MEDIUM:
+ ftLoadFlags |= FT_LOAD_TARGET_NORMAL;
+ break;
+ case FC_HINT_FULL:
+ if (aaType == TEXT_AA_ON)
+ ftLoadFlags |= FT_LOAD_TARGET_NORMAL;
+ else
+ ftLoadFlags |= horizontal ? FT_LOAD_TARGET_LCD : FT_LOAD_TARGET_LCD_V;
+ break;
+ default:
+ ftLoadFlags |= FT_LOAD_TARGET_NORMAL;
+ break;
+ }
+ }
+
+ // autohinting
+ FcBool fcAutohint = 0;
+ if (pattern && FcPatternGetBool(pattern, FC_AUTOHINT, 0, &fcAutohint) == FcResultMatch)
+ if (fcAutohint)
+ ftLoadFlags |= FT_LOAD_FORCE_AUTOHINT;
+
+ // LCD filter
+ int fcLCDFilter = FC_LCD_DEFAULT;
+ if (pattern)
+ FcPatternGetInteger(pattern, FC_LCD_FILTER, 0, &fcLCDFilter);
+ switch (fcLCDFilter) {
+ case FC_LCD_NONE:
+ ftLcdFilter = FT_LCD_FILTER_NONE;
+ break;
+ case FC_LCD_DEFAULT:
+ ftLcdFilter = FT_LCD_FILTER_DEFAULT;
+ break;
+ case FC_LCD_LIGHT:
+ ftLcdFilter = FT_LCD_FILTER_LIGHT;
+ break;
+ case FC_LCD_LEGACY:
+ ftLcdFilter = FT_LCD_FILTER_LEGACY;
+ break;
+ default:
+ ftLcdFilter = FT_LCD_FILTER_DEFAULT;
+ break;
+ }
+
+ if (pattern)
+ FcPatternDestroy(pattern);
+
+ rp->ftRenderMode = ftRenderMode;
+ rp->ftLoadFlags = ftLoadFlags;
+ rp->ftLcdFilter = ftLcdFilter;
+}
+
#ifdef DEBUG
/* These are referenced in the freetype sources if DEBUG macro is defined.
To simplify work with debuging version of freetype we define
@@ -868,29 +996,12 @@ static jlong
renderFlags |= FT_LOAD_NO_HINTING;
}
- if (!context->useSbits) {
- renderFlags |= FT_LOAD_NO_BITMAP;
- }
+ RenderingProperties renderingProperties;
+ readFontconfig((const FcChar8 *) scalerInfo->face->family_name,
+ context->ptsz, context->aaType, &renderingProperties);
- /* NB: in case of non identity transform
- we might also prefer to disable transform before hinting,
- and apply it explicitly after hinting is performed.
- Or we can disable hinting. */
-
- /* select appropriate hinting mode */
- if (context->aaType == TEXT_AA_OFF) {
- target = FT_LOAD_TARGET_MONO;
- } else if (context->aaType == TEXT_AA_ON) {
- target = FT_LOAD_TARGET_NORMAL;
- } else if (context->aaType == TEXT_AA_LCD_HRGB ||
- context->aaType == TEXT_AA_LCD_HBGR) {
- target = FT_LOAD_TARGET_LCD;
- } else {
- target = FT_LOAD_TARGET_LCD_V;
- }
- renderFlags |= target;
-
- error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags);
+ FT_Library_SetLcdFilter(scalerInfo->library, renderingProperties.ftLcdFilter);
+ error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags);
if (error) {
//do not destroy scaler yet.
//this can be problem of particular context (e.g. with bad transform)
@@ -915,11 +1026,11 @@ static jlong
glyphInfo = getNullGlyphImage();
return ptr_to_jlong(glyphInfo);
}
- error = FT_Render_Glyph(ftglyph, FT_LOAD_TARGET_MODE(target));
- if (error != 0) {
- return ptr_to_jlong(getNullGlyphImage());
- }
}
+ error = FT_Render_Glyph(ftglyph, renderingProperties.ftRenderMode);
+ if (error != 0) {
+ return ptr_to_jlong(getNullGlyphImage());
+ }
if (renderImage) {
width = (UInt16) ftglyph->bitmap.width;
@@ -1134,9 +1245,11 @@ static FT_Outline* getFTOutline(JNIEnv* env, jobject f
return NULL;
}
- renderFlags = FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP;
+ RenderingProperties renderingProperties;
+ readFontconfig((const FcChar8 *) scalerInfo->face->family_name,
+ context->ptsz, context->aaType, &renderingProperties);
- error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags);
+ error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags);
if (error) {
return NULL;
}
java/openjdk15/pkg-descr
-3
View File
@@ -1,3 +0,0 @@
An open-source implementation of the Java Platform, Standard Edition,
WWW: https://openjdk.java.net/projects/jdk/15/
java/openjdk15/pkg-message
-18
View File
@@ -1,18 +0,0 @@
[
{ type: install
message: <<EOM
This OpenJDK implementation requires fdescfs(5) mounted on /dev/fd and
procfs(5) mounted on /proc.
If you have not done it yet, please do the following:
mount -t fdescfs fdesc /dev/fd
mount -t procfs proc /proc
To make it permanent, you need the following lines in /etc/fstab:
fdesc /dev/fd fdescfs rw 0 0
proc /proc procfs rw 0 0
EOM
}
]
java/openjdk16/Makefile
-194
View File
@@ -1,194 +0,0 @@
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= 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 \
libharfbuzz.so:print/harfbuzz \
liblcms2.so:graphics/lcms2 \
libpng.so:graphics/png
RUN_DEPENDS= javavm:java/javavmwrapper \
xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype
DEPRECATED= EOLed since 30 September 2021
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= jdk16u
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= 16
JDK_MINOR_VERSION= 0
JDK_PATCH_VERSION= 2
JDK_BUILD_NUMBER= 7
BSD_JDK_VERSION= 1
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-harfbuzz=system \
--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}/openjdk16 \
${LOCALBASE}/openjdk15
# 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}/openjdk15
BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk15
.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
EXTRA_CFLAGS+= -Wno-unused-but-set-parameter
.if ${COMPILER_VERSION} >= 140
EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical
.endif
CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}"
CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}"
.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>
java/openjdk16/distinfo
-3
View File
@@ -1,3 +0,0 @@
TIMESTAMP = 1627709200
SHA256 (battleblow-jdk16u-jdk-16.0.2+7-1_GH0.tar.gz) = 028b193ceb5ad53c44f9fa060e70a9b6b9b723919bfb36d858638695ecd8e3ae
SIZE (battleblow-jdk16u-jdk-16.0.2+7-1_GH0.tar.gz) = 104523305
java/openjdk16/files/cacerts
BIN
View File
Binary file not shown.
java/openjdk16/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp
-11
View File
@@ -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; }
java/openjdk16/files/patch-configure
-14
View File
@@ -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 "$@"
java/openjdk16/files/patch-make_autoconf_flags-cflags.m4
-13
View File
@@ -1,13 +0,0 @@
--- 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
java/openjdk16/files/patch-make_autoconf_libraries.m4
-15
View File
@@ -1,15 +0,0 @@
--- 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=
java/openjdk16/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk
-11
View File
@@ -1,11 +0,0 @@
--- make/modules/java.desktop/lib/Awt2dLibraries.gmk.orig 2020-07-08 21:33:08 UTC
+++ make/modules/java.desktop/lib/Awt2dLibraries.gmk
@@ -579,7 +579,7 @@
LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
LDFLAGS_aix := -Wl$(COMMA)-berok, \
LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
- LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
+ LIBS_unix := -lfontconfig -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
LIBS_macosx := -lawt_lwawt, \
LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
$(WIN_AWT_LIB), \
java/openjdk16/files/patch-src_hotspot_os_bsd_os__bsd.cpp
-11
View File
@@ -1,11 +0,0 @@
--- 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
java/openjdk16/files/patch-src_hotspot_share_adlc_formsopt.cpp
-26
View File
@@ -1,26 +0,0 @@
https://github.com/battleblow/jdk16u/pull/1
--- src/hotspot/share/adlc/formsopt.cpp.orig 2021-07-23 23:38:59 UTC
+++ src/hotspot/share/adlc/formsopt.cpp
@@ -436,15 +436,20 @@ void AllocClass::output(FILE *fp) { // Write inf
//==============================Frame Handling=================================
//------------------------------FrameForm--------------------------------------
FrameForm::FrameForm() {
+ _sync_stack_slots = NULL;
+ _inline_cache_reg = NULL;
+ _interpreter_frame_pointer_reg = NULL;
+ _cisc_spilling_operand_name = NULL;
_frame_pointer = NULL;
_c_frame_pointer = NULL;
_alignment = NULL;
+ _return_addr_loc = false;
+ _c_return_addr_loc = false;
_return_addr = NULL;
_c_return_addr = NULL;
_varargs_C_out_slots_killed = NULL;
_return_value = NULL;
_c_return_value = NULL;
- _interpreter_frame_pointer_reg = NULL;
}
FrameForm::~FrameForm() {
java/openjdk16/files/patch-src_java.desktop_share_native_libfontmanager_freetypeScaler.c
-209
View File
@@ -1,209 +0,0 @@
--- src/java.desktop/share/native/libfontmanager/freetypeScaler.c.orig 2020-07-08 21:34:01 UTC
+++ src/java.desktop/share/native/libfontmanager/freetypeScaler.c
@@ -43,6 +43,7 @@
#include FT_SYNTHESIS_H
#include FT_LCD_FILTER_H
#include FT_MODULE_H
+#include <fontconfig/fontconfig.h>
#include "fontscaler.h"
@@ -87,6 +88,133 @@ typedef struct FTScalerContext {
int ptsz; /* size in points */
} FTScalerContext;
+typedef struct {
+ FT_Render_Mode ftRenderMode;
+ int ftLoadFlags;
+ FT_LcdFilter ftLcdFilter;
+} RenderingProperties;
+
+static FcPattern* matchedPattern(const FcChar8* family, double ptSize) {
+ FcPattern* pattern = FcPatternCreate();
+ if (!pattern)
+ return 0;
+
+ FcPatternAddString(pattern, FC_FAMILY, family);
+ FcPatternAddBool(pattern, FC_SCALABLE, FcTrue);
+ FcPatternAddDouble(pattern, FC_SIZE, ptSize);
+
+ FcConfigSubstitute(0, pattern, FcMatchPattern);
+ FcDefaultSubstitute(pattern);
+
+ FcResult res;
+ FcPattern *match = FcFontMatch(0, pattern, &res);
+ FcPatternDestroy(pattern);
+ return (res == FcResultMatch) ? match : NULL;
+}
+
+static void readFontconfig(const FcChar8* family, double ptSize, jint aaType, RenderingProperties* rp) {
+ FcPattern *pattern = matchedPattern(family, ptSize);
+
+ FT_Render_Mode ftRenderMode = FT_RENDER_MODE_NORMAL;
+ int ftLoadFlags = FT_LOAD_DEFAULT;
+ FT_LcdFilter ftLcdFilter = FT_LCD_FILTER_DEFAULT;
+ FcBool fcAntialias = 0;
+ char horizontal = 1;
+
+ // subpixel order
+ if (aaType == TEXT_AA_ON)
+ ftRenderMode = FT_RENDER_MODE_NORMAL;
+ else if (aaType == TEXT_AA_OFF)
+ ftRenderMode = FT_RENDER_MODE_MONO;
+ else {
+ int fcRGBA = FC_RGBA_UNKNOWN;
+ if (pattern)
+ FcPatternGetInteger(pattern, FC_RGBA, 0, &fcRGBA);
+ switch (fcRGBA) {
+ case FC_RGBA_NONE:
+ ftRenderMode = FT_RENDER_MODE_NORMAL;
+ break;
+ case FC_RGBA_RGB:
+ case FC_RGBA_BGR:
+ ftRenderMode = FT_RENDER_MODE_LCD;
+ horizontal = 1;
+ break;
+ case FC_RGBA_VRGB:
+ case FC_RGBA_VBGR:
+ ftRenderMode = FT_RENDER_MODE_LCD_V;
+ horizontal = 0;
+ break;
+ default:
+ ftRenderMode = FT_RENDER_MODE_NORMAL;
+ break;
+ }
+ }
+
+ // loading mode
+ if (aaType == TEXT_AA_OFF)
+ ftLoadFlags |= FT_LOAD_TARGET_MONO;
+ else {
+ int fcHintStyle = FC_HINT_NONE;
+ if (pattern)
+ FcPatternGetInteger(pattern, FC_HINT_STYLE, 0, &fcHintStyle);
+ switch (fcHintStyle) {
+ case FC_HINT_NONE:
+ ftLoadFlags |= FT_LOAD_NO_HINTING;
+ break;
+ case FC_HINT_SLIGHT:
+ ftLoadFlags |= FT_LOAD_TARGET_LIGHT;
+ break;
+ case FC_HINT_MEDIUM:
+ ftLoadFlags |= FT_LOAD_TARGET_NORMAL;
+ break;
+ case FC_HINT_FULL:
+ if (aaType == TEXT_AA_ON)
+ ftLoadFlags |= FT_LOAD_TARGET_NORMAL;
+ else
+ ftLoadFlags |= horizontal ? FT_LOAD_TARGET_LCD : FT_LOAD_TARGET_LCD_V;
+ break;
+ default:
+ ftLoadFlags |= FT_LOAD_TARGET_NORMAL;
+ break;
+ }
+ }
+
+ // autohinting
+ FcBool fcAutohint = 0;
+ if (pattern && FcPatternGetBool(pattern, FC_AUTOHINT, 0, &fcAutohint) == FcResultMatch)
+ if (fcAutohint)
+ ftLoadFlags |= FT_LOAD_FORCE_AUTOHINT;
+
+ // LCD filter
+ int fcLCDFilter = FC_LCD_DEFAULT;
+ if (pattern)
+ FcPatternGetInteger(pattern, FC_LCD_FILTER, 0, &fcLCDFilter);
+ switch (fcLCDFilter) {
+ case FC_LCD_NONE:
+ ftLcdFilter = FT_LCD_FILTER_NONE;
+ break;
+ case FC_LCD_DEFAULT:
+ ftLcdFilter = FT_LCD_FILTER_DEFAULT;
+ break;
+ case FC_LCD_LIGHT:
+ ftLcdFilter = FT_LCD_FILTER_LIGHT;
+ break;
+ case FC_LCD_LEGACY:
+ ftLcdFilter = FT_LCD_FILTER_LEGACY;
+ break;
+ default:
+ ftLcdFilter = FT_LCD_FILTER_DEFAULT;
+ break;
+ }
+
+ if (pattern)
+ FcPatternDestroy(pattern);
+
+ rp->ftRenderMode = ftRenderMode;
+ rp->ftLoadFlags = ftLoadFlags;
+ rp->ftLcdFilter = ftLcdFilter;
+}
+
#ifdef DEBUG
/* These are referenced in the freetype sources if DEBUG macro is defined.
To simplify work with debuging version of freetype we define
@@ -868,29 +996,12 @@ static jlong
renderFlags |= FT_LOAD_NO_HINTING;
}
- if (!context->useSbits) {
- renderFlags |= FT_LOAD_NO_BITMAP;
- }
+ RenderingProperties renderingProperties;
+ readFontconfig((const FcChar8 *) scalerInfo->face->family_name,
+ context->ptsz, context->aaType, &renderingProperties);
- /* NB: in case of non identity transform
- we might also prefer to disable transform before hinting,
- and apply it explicitly after hinting is performed.
- Or we can disable hinting. */
-
- /* select appropriate hinting mode */
- if (context->aaType == TEXT_AA_OFF) {
- target = FT_LOAD_TARGET_MONO;
- } else if (context->aaType == TEXT_AA_ON) {
- target = FT_LOAD_TARGET_NORMAL;
- } else if (context->aaType == TEXT_AA_LCD_HRGB ||
- context->aaType == TEXT_AA_LCD_HBGR) {
- target = FT_LOAD_TARGET_LCD;
- } else {
- target = FT_LOAD_TARGET_LCD_V;
- }
- renderFlags |= target;
-
- error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags);
+ FT_Library_SetLcdFilter(scalerInfo->library, renderingProperties.ftLcdFilter);
+ error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags);
if (error) {
//do not destroy scaler yet.
//this can be problem of particular context (e.g. with bad transform)
@@ -915,11 +1026,11 @@ static jlong
glyphInfo = getNullGlyphImage();
return ptr_to_jlong(glyphInfo);
}
- error = FT_Render_Glyph(ftglyph, FT_LOAD_TARGET_MODE(target));
- if (error != 0) {
- return ptr_to_jlong(getNullGlyphImage());
- }
}
+ error = FT_Render_Glyph(ftglyph, renderingProperties.ftRenderMode);
+ if (error != 0) {
+ return ptr_to_jlong(getNullGlyphImage());
+ }
if (renderImage) {
width = (UInt16) ftglyph->bitmap.width;
@@ -1134,9 +1245,11 @@ static FT_Outline* getFTOutline(JNIEnv* env, jobject f
return NULL;
}
- renderFlags = FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP;
+ RenderingProperties renderingProperties;
+ readFontconfig((const FcChar8 *) scalerInfo->face->family_name,
+ context->ptsz, context->aaType, &renderingProperties);
- error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags);
+ error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags);
if (error) {
return NULL;
}
java/openjdk16/pkg-descr
-3
View File
@@ -1,3 +0,0 @@
An open-source implementation of the Java Platform, Standard Edition,
WWW: https://openjdk.java.net/projects/jdk/16/
java/openjdk16/pkg-message
-18
View File
@@ -1,18 +0,0 @@
[
{ type: install
message: <<EOM
This OpenJDK implementation requires fdescfs(5) mounted on /dev/fd and
procfs(5) mounted on /proc.
If you have not done it yet, please do the following:
mount -t fdescfs fdesc /dev/fd
mount -t procfs proc /proc
To make it permanent, you need the following lines in /etc/fstab:
fdesc /dev/fd fdescfs rw 0 0
proc /proc procfs rw 0 0
EOM
}
]
java/openjdk17/Makefile
+1 -10
View File
@@ -112,11 +112,7 @@ JDK_BUILD_TYPE= release
.include <bsd.port.pre.mk>
BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk17
.if ${ARCH} == aarch64 || ${ARCH} == amd64 || (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le
BOOTSTRAP_JDKS+= ${LOCALBASE}/bootstrap-openjdk17
.endif
BOOTSTRAP_JDKS+= ${LOCALBASE}/openjdk16
BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk17 ${LOCALBASE}/bootstrap-openjdk17
# do we have valid native jdk installed?
.for BJDK in ${BOOTSTRAP_JDKS}
@@ -127,13 +123,8 @@ BOOTSTRAPJDKDIR= ${BJDK}
# if no valid jdk found, set dependency
.if !defined(BOOTSTRAPJDKDIR)
. if ${ARCH} == aarch64 || ${ARCH} == amd64 || (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le
BOOTSTRAPJDKDIR?= ${LOCALBASE}/bootstrap-openjdk17
BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/bootstrap-openjdk17
. else
BOOTSTRAPJDKDIR?= ${LOCALBASE}/openjdk16
BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk16
. endif
.endif
JDK_BUILD_JVM= server
www/closure-compiler/Makefile
+1 -1
View File
@@ -13,7 +13,7 @@ COMMENT= Closure Compiler
LICENSE= APACHE20
USE_JAVA= 13
USE_JAVA= 11+
NO_ARCH= yes
NO_BUILD= yes