Skip to content

Commit 1b1bfba

Browse files
Greg LewisGreg Lewis
Greg Lewis
authored and
Greg Lewis
committed
java/openjdk17: Add a port of OpenJDK 17
* Add a port of OpenJDK 17 * Restrict to amd64 and aarch64 until more platforms are tested
1 parent ef38176 commit 1b1bfba

13 files changed

+491
-0
lines changed

‎java/Makefile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595
SUBDIR += openjdk14
9696
SUBDIR += openjdk15
9797
SUBDIR += openjdk16
98+
SUBDIR += openjdk17
9899
SUBDIR += openjdk7
99100
SUBDIR += openjdk7-jre
100101
SUBDIR += openjdk8

‎java/openjdk17/Makefile‎

Lines changed: 182 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,182 @@
1+
PORTNAME= openjdk
2+
DISTVERSIONPREFIX= jdk-
3+
DISTVERSION= ${JDK_MAJOR_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
4+
CATEGORIES= java devel
5+
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
6+
7+
MAINTAINER= [email protected]
8+
COMMENT= Java Development Kit ${JDK_MAJOR_VERSION}
9+
10+
LICENSE= GPLv2
11+
12+
ONLY_FOR_ARCHS= amd64 aarch64
13+
14+
BUILD_DEPENDS= zip:archivers/zip \
15+
autoconf>0:devel/autoconf \
16+
${LOCALBASE}/include/cups/cups.h:print/cups \
17+
bash:shells/bash \
18+
gsed:textproc/gsed
19+
LIB_DEPENDS= libasound.so:audio/alsa-lib \
20+
libfontconfig.so:x11-fonts/fontconfig \
21+
libfreetype.so:print/freetype2 \
22+
libgif.so:graphics/giflib \
23+
libharfbuzz.so:print/harfbuzz \
24+
liblcms2.so:graphics/lcms2 \
25+
libpng.so:graphics/png
26+
RUN_DEPENDS= javavm:java/javavmwrapper \
27+
xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype
28+
29+
USES= compiler:features cpe gmake iconv jpeg pkgconfig xorg
30+
USE_XORG= x11 xext xi xrandr xrender xt xtst
31+
32+
CPE_VENDOR= oracle
33+
34+
USE_GITHUB= yes
35+
GH_ACCOUNT= battleblow
36+
GH_PROJECT= jdk17
37+
38+
NO_CCACHE= yes
39+
40+
_MAKE_JOBS= #
41+
MAKE_ENV= LANG="C" \
42+
LC_ALL="C" \
43+
CLASSPATH="" \
44+
JAVA_HOME="" \
45+
LD_LIBRARY_PATH="" \
46+
CC=${CC} \
47+
CXX=${CXX} \
48+
CPP=${CPP} \
49+
MAKEFLAGS=""
50+
51+
JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
52+
JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
53+
JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk
54+
INSTALLDIR= ${PREFIX}/${PKGBASE}
55+
56+
NOPRECIOUSMAKEVARS= yes
57+
58+
JDK_MAJOR_VERSION= 17
59+
JDK_MINOR_VERSION= 0
60+
JDK_PATCH_VERSION= 0
61+
JDK_BUILD_NUMBER= 35
62+
BSD_JDK_VERSION= 1
63+
64+
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
65+
66+
GNU_CONFIGURE= yes
67+
CONFIGURE_ENV= CC=${CC} \
68+
CXX=${CXX} \
69+
CPP=${CPP} \
70+
ac_cv_path_SED=${LOCALBASE}/bin/gsed
71+
CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \
72+
--disable-ccache \
73+
--disable-javac-server \
74+
--disable-hotspot-gtest \
75+
--with-alsa=${LOCALBASE} \
76+
--with-cups=${LOCALBASE} \
77+
--with-fontconfig=${LOCALBASE} \
78+
--with-freetype=system \
79+
--with-freetype-include=${LOCALBASE}/include/freetype2 \
80+
--with-freetype-lib=${LOCALBASE}/lib \
81+
--with-libjpeg=system \
82+
--with-giflib=system \
83+
--with-giflib-include=${LOCALBASE}/include \
84+
--with-giflib-lib=${LOCALBASE}/lib \
85+
--with-harfbuzz=system \
86+
--with-libpng=system \
87+
--with-zlib=system \
88+
--with-lcms=system \
89+
--x-includes=${LOCALBASE}/include \
90+
--x-libraries=${LOCALBASE}/lib \
91+
--with-cacerts-file=${FILESDIR}/cacerts \
92+
--with-version-string=${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} \
93+
--with-native-debug-symbols=none \
94+
--with-debug-level=release \
95+
--with-vendor-name="OpenJDK BSD Porting Team" \
96+
--with-vendor-url="https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/" \
97+
--with-vendor-bug-url="${JDK_BUG_URL}" \
98+
--with-vendor-vm-bug-url="${JDK_BUG_URL}"
99+
100+
JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION}
101+
102+
ALL_TARGET= images
103+
JDK_BUILD_TYPE= release
104+
105+
.include <bsd.port.pre.mk>
106+
107+
BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk17 \
108+
${LOCALBASE}/openjdk16
109+
110+
# do we have valid native jdk installed?
111+
.for BJDK in ${BOOTSTRAP_JDKS}
112+
. if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac)
113+
BOOTSTRAPJDKDIR= ${BJDK}
114+
. endif
115+
.endfor
116+
117+
# if no valid jdk found, set dependency
118+
.if !defined(BOOTSTRAPJDKDIR)
119+
BOOTSTRAPJDKDIR?= ${LOCALBASE}/openjdk16
120+
BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk16
121+
.endif
122+
123+
JDK_BUILD_JVM= server
124+
125+
MAKE_ENV+= --with-toolchain-type=${COMPILER_TYPE}
126+
CONFIGURE_ARGS+= --with-toolchain-type=${COMPILER_TYPE}
127+
128+
.if ${COMPILER_TYPE} == gcc
129+
USE_GCC= yes
130+
CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L/usr/local/lib/gcc${GCC_DEFAULT}" \
131+
--with-extra-cflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \
132+
--with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
133+
.else
134+
MAKE_ENV+= USE_CLANG=true
135+
.endif
136+
137+
.if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*}
138+
CONFIGURE_ARGS+= --disable-warnings-as-errors
139+
.endif
140+
.if ${ARCH} == aarch64 || (defined(PPC_ABI) && ${PPC_ABI} == ELFv1)
141+
CONFIGURE_ARGS+= --disable-dtrace
142+
.endif
143+
.if (defined(PPC_ABI) && ${PPC_ABI} == ELFv2) || ${ARCH} == powerpc64le
144+
CONFIGURE_ARGS+= --disable-precompiled-headers
145+
.endif
146+
.if ${ARCH} != amd64
147+
CONFIGURE_ARGS+= --enable-aot=no
148+
.endif
149+
.if ${ARCH} == powerpc64 && ${OSREL:C/\.[0-9]//} == 12
150+
EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp
151+
.endif
152+
153+
.if empty(ICONV_LIB)
154+
ICONV_CFLAGS= -DLIBICONV_PLUG
155+
.else
156+
ICONV_CFLAGS= -I${LOCALBASE}/include
157+
ICONV_LDFLAGS= -L${LOCALBASE}/lib
158+
ICONV_LIBS= ${ICONV_LIB}
159+
.endif
160+
161+
post-patch:
162+
@${FIND} ${WRKSRC} -name '*.orig' -delete
163+
@${CHMOD} 755 ${WRKSRC}/configure
164+
@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
165+
${WRKSRC}/configure \
166+
${WRKSRC}/src/hotspot/os/bsd/os_bsd.cpp
167+
@${REINPLACE_CMD} -e 's|%%ICONV_CFLAGS%%|${ICONV_CFLAGS}|' \
168+
-e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \
169+
-e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \
170+
${WRKSRC}/make/autoconf/libraries.m4
171+
172+
do-install:
173+
@${MKDIR} ${STAGEDIR}${INSTALLDIR}
174+
@cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR}
175+
@cd ${STAGEDIR}${INSTALLDIR} && \
176+
${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \;
177+
@${CHMOD} ${BINMODE} ${STAGEDIR}${INSTALLDIR}/lib/jspawnhelper
178+
@${ECHO} "@javavm ${INSTALLDIR}/bin/java" >> ${TMPPLIST}
179+
@${FIND} ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \
180+
${SED} -e 's|^${STAGEDIR}${PREFIX}/||' >> ${TMPPLIST}
181+
182+
.include <bsd.port.post.mk>

‎java/openjdk17/distinfo‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
TIMESTAMP = 1632003856
2+
SHA256 (battleblow-jdk17-jdk-17+35-1_GH0.tar.gz) = 7a4b9e8408de588ae19dbdf6ba0292ff672de77a4af4b42e31f271bacd796e72
3+
SIZE (battleblow-jdk17-jdk-17+35-1_GH0.tar.gz) = 104691774

‎java/openjdk17/files/cacerts‎

102 KB
Binary file not shown.

‎java/openjdk17/files/extra-patch-src_hotspot_cpu_ppc_vm__version__ppc.hpp‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- src/hotspot/cpu/ppc/vm_version_ppc.hpp.orig 2019-10-16 11:31:09.000000000 -0700
2+
+++ src/hotspot/cpu/ppc/vm_version_ppc.hpp 2019-10-23 12:54:06.972903000 -0700
3+
@@ -108,7 +108,7 @@
4+
static bool has_lqarx() { return (_features & lqarx_m) != 0; }
5+
static bool has_vcipher() { return (_features & vcipher_m) != 0; }
6+
static bool has_vpmsumb() { return (_features & vpmsumb_m) != 0; }
7+
- static bool has_mfdscr() { return (_features & mfdscr_m) != 0; }
8+
+ static bool has_mfdscr() { return false; }
9+
static bool has_vsx() { return (_features & vsx_m) != 0; }
10+
static bool has_ldbrx() { return (_features & ldbrx_m) != 0; }
11+
static bool has_stdbrx() { return (_features & stdbrx_m) != 0; }

‎java/openjdk17/files/patch-configure‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--- configure.orig 2019-03-12 12:38:39.648907000 -0700
2+
+++ configure 2019-03-12 12:39:04.275572000 -0700
3+
@@ -1,4 +1,4 @@
4+
-#!/bin/bash
5+
+#!%%LOCALBASE%%/bin/bash
6+
#
7+
# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
8+
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
9+
@@ -32,4 +32,4 @@
10+
# Delegate to wrapper, forcing wrapper to believe $0 is this script by using -c.
11+
# This trick is needed to get autoconf to co-operate properly.
12+
# The ${-:+-$-} construction passes on bash options.
13+
-bash ${-:+-$-} -c ". $this_script_dir/make/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@"
14+
+%%LOCALBASE%%/bin/bash ${-:+-$-} -c ". $this_script_dir/make/autoconf/configure" $this_script_dir/configure CHECKME $this_script_dir "$@"

‎java/openjdk17/files/patch-make_autoconf_flags-cflags.m4‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
--- make/autoconf/flags-cflags.m4.orig 2020-01-08 09:12:31 UTC
2+
+++ make/autoconf/flags-cflags.m4
3+
@@ -770,6 +770,10 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
4+
# for all archs except arm and ppc, prevent gcc to omit frame pointer
5+
$1_CFLAGS_CPU_JDK="${$1_CFLAGS_CPU_JDK} -fno-omit-frame-pointer"
6+
fi
7+
+ elif test "x$OPENJDK_TARGET_OS_ENV" = xbsd.freebsd; then
8+
+ if test "x$FLAGS_CPU" = xppc64; then
9+
+ $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=powerpc64 -mtune=power5"
10+
+ fi
11+
fi
12+
13+
elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then

‎java/openjdk17/files/patch-make_autoconf_libraries.m4‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
--- make/autoconf/libraries.m4~ 2019-08-12 19:10:36.292217000 -0700
2+
+++ make/autoconf/libraries.m4 2019-08-12 19:18:15.523606000 -0700
3+
@@ -188,9 +188,9 @@
4+
ICONV_LDFLAGS="-L/usr/local/lib"
5+
ICONV_LIBS=-liconv
6+
elif test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then
7+
- ICONV_CFLAGS=-DLIBICONV_PLUG
8+
- ICONV_LDFLAGS=
9+
- ICONV_LIBS=
10+
+ ICONV_CFLAGS=%%ICONV_CFLAGS%%
11+
+ ICONV_LDFLAGS=%%ICONV_LDFLAGS%%
12+
+ ICONV_LIBS=%%ICONV_LIBS%%
13+
else
14+
ICONV_CFLAGS=
15+
ICONV_LDFLAGS=

‎java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- make/modules/java.desktop/lib/Awt2dLibraries.gmk.orig 2021-09-18 15:30:22.109237000 -0700
2+
+++ make/modules/java.desktop/lib/Awt2dLibraries.gmk 2021-09-18 15:31:02.024314000 -0700
3+
@@ -530,7 +530,7 @@
4+
LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
5+
LDFLAGS_aix := -Wl$(COMMA)-berok, \
6+
LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \
7+
- LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
8+
+ LIBS_unix := -lfontconfig -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \
9+
LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation -framework CoreGraphics, \
10+
LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \
11+
$(WIN_AWT_LIB), \

‎java/openjdk17/files/patch-src_hotspot_os_bsd_os__bsd.cpp‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- src/hotspot/os/bsd/os_bsd.cpp.orig 2019-03-28 21:47:08.000000000 -0700
2+
+++ src/hotspot/os/bsd/os_bsd.cpp 2019-03-28 23:08:55.590922000 -0700
3+
@@ -361,7 +361,7 @@
4+
#elif defined(__NetBSD__)
5+
#define DEFAULT_LIBPATH "/usr/lib:/usr/pkg/lib"
6+
#else
7+
- #define DEFAULT_LIBPATH "/usr/lib:/usr/local/lib"
8+
+ #define DEFAULT_LIBPATH "/usr/lib:%%LOCALBASE%%/lib"
9+
#endif
10+
#else
11+
#define DEFAULT_LIBPATH OVERRIDE_LIBPATH

0 commit comments

Comments
 (0)