Skip to content

Commit ae75c2c

Browse files
mreid-tthgy59
mreid-tt
and
hgy59
authored
java-17-openjdk: Update to v17.0.16+7 (#6622)
* java-17-openjdk: update to v17.0.16+7 * fix build for evansport, aarch64 and armv7 * use default PKCS#12 cacerts truststore --------- Co-authored-by: hgy59 <[email protected]>
1 parent 127149f commit ae75c2c

File tree

6 files changed

+153
-184
lines changed

6 files changed

+153
-184
lines changed

‎cross/java-17-openjdk/Makefile

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
PKG_NAME = java-17-openjdk
22
JAVA_REPO_NAME = jdk17u
33
JAVA_NAME = jdk
4-
JAVA_RELEASE = 10
5-
JAVA_VERSION = 17.0.6
4+
JAVA_RELEASE = 7
5+
JAVA_VERSION = 17.0.16
66
PKG_VERS = $(JAVA_VERSION).$(JAVA_RELEASE)
77
PKG_EXT = tar.gz
88
PKG_DIST_NAME = $(JAVA_NAME)-$(JAVA_VERSION)+$(JAVA_RELEASE).$(PKG_EXT)
@@ -68,8 +68,6 @@ CONFIGURE_ARGS += --with-extra-cxxflags="$(CPPFLAGS) -fno-stack-protector -Wno-d
6868
CONFIGURE_ARGS += --with-extra-ldflags="$(LDFLAGS) -Xlinker -z -Xlinker relro -Xlinker -Bsymbolic-functions"
6969
CONFIGURE_ARGS += --with-libffi=$(INSTALL_DIR)/$(INSTALL_PREFIX)
7070
CONFIGURE_ARGS += --disable-manpages
71-
CONFIGURE_ARGS += --with-cacerts-file=/etc/ssl/certs/ca-certificates.crt
72-
CONFIGURE_ARGS += --with-cacerts-src=/etc/ssl/certs
7371
# Disable all GUI related
7472
CONFIGURE_ARGS += --enable-headless-only
7573
# customize for SynoCommunity
@@ -100,6 +98,11 @@ COMPILE_MAKE_OPTIONS += JOBS=$(NCPUS)
10098

10199
include ../../mk/spksrc.cross-cc.mk
102100

101+
ifneq ($(findstring $(ARCH),$(x64_ARCHS)),$(ARCH))
102+
# "Intel Short Vector Math Library (SVML)" is built for x64 only
103+
PLIST_TRANSFORM = sed -e '/lib\/libjsvml.so/d'
104+
endif
105+
103106
.PHONY: java-17-openjdk_configure
104107
# Use CONFIGURE_ARGS instead of REAL_CONFIGURE_ARGS to ignore TC_CONFIGURE_ARGS
105108
# Disable the normal host build target triplets since openjdk uses its own openjdk-target
@@ -114,7 +117,9 @@ java-17-openjdk_pre_compile:
114117

115118
.PHONY: java-17-openjdk_post_compile
116119
java-17-openjdk_post_compile:
120+
@$(MSG) Link binaries into version independent bin folder
117121
@cd $(STAGING_INSTALL_PREFIX)/bin && ln -sf ../jvm/openjdk-$(JAVA_VERSION)/bin/* .
122+
@$(MSG) Install license files
118123
@cp -pf $(WORK_DIR)/$(PKG_DIR)/LICENSE $(STAGING_INSTALL_PREFIX)/jvm/openjdk-$(JAVA_VERSION)/
119124
@cp -pf $(WORK_DIR)/$(PKG_DIR)/ADDITIONAL_LICENSE_INFO $(STAGING_INSTALL_PREFIX)/jvm/openjdk-$(JAVA_VERSION)/
120125
@cp -pf $(WORK_DIR)/$(PKG_DIR)/ASSEMBLY_EXCEPTION $(STAGING_INSTALL_PREFIX)/jvm/openjdk-$(JAVA_VERSION)/

‎cross/java-17-openjdk/PLIST

Lines changed: 133 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ lnk:bin/jdb
1010
lnk:bin/jdeprscan
1111
lnk:bin/jdeps
1212
lnk:bin/jfr
13+
lnk:bin/jhsdb
1314
lnk:bin/jimage
1415
lnk:bin/jinfo
1516
lnk:bin/jlink
@@ -25,133 +26,135 @@ lnk:bin/jstatd
2526
lnk:bin/keytool
2627
lnk:bin/rmiregistry
2728
lnk:bin/serialver
28-
bin:jvm/openjdk-17.0.6/bin/*
29-
rsc:jvm/openjdk-17.0.6/conf/
30-
rsc:jvm/openjdk-17.0.6/include/classfile_constants.h
31-
rsc:jvm/openjdk-17.0.6/include/jawt.h
32-
rsc:jvm/openjdk-17.0.6/include/jdwpTransport.h
33-
rsc:jvm/openjdk-17.0.6/include/jni.h
34-
rsc:jvm/openjdk-17.0.6/include/jvmti.h
35-
rsc:jvm/openjdk-17.0.6/include/jvmticmlr.h
36-
rsc:jvm/openjdk-17.0.6/include/linux/jawt_md.h
37-
rsc:jvm/openjdk-17.0.6/include/linux/jni_md.h
38-
rsc:jvm/openjdk-17.0.6/jmods/java.base.jmod
39-
rsc:jvm/openjdk-17.0.6/jmods/java.compiler.jmod
40-
rsc:jvm/openjdk-17.0.6/jmods/java.datatransfer.jmod
41-
rsc:jvm/openjdk-17.0.6/jmods/java.desktop.jmod
42-
rsc:jvm/openjdk-17.0.6/jmods/java.instrument.jmod
43-
rsc:jvm/openjdk-17.0.6/jmods/java.logging.jmod
44-
rsc:jvm/openjdk-17.0.6/jmods/java.management.jmod
45-
rsc:jvm/openjdk-17.0.6/jmods/java.management.rmi.jmod
46-
rsc:jvm/openjdk-17.0.6/jmods/java.naming.jmod
47-
rsc:jvm/openjdk-17.0.6/jmods/java.net.http.jmod
48-
rsc:jvm/openjdk-17.0.6/jmods/java.prefs.jmod
49-
rsc:jvm/openjdk-17.0.6/jmods/java.rmi.jmod
50-
rsc:jvm/openjdk-17.0.6/jmods/java.scripting.jmod
51-
rsc:jvm/openjdk-17.0.6/jmods/java.se.jmod
52-
rsc:jvm/openjdk-17.0.6/jmods/java.security.jgss.jmod
53-
rsc:jvm/openjdk-17.0.6/jmods/java.security.sasl.jmod
54-
rsc:jvm/openjdk-17.0.6/jmods/java.smartcardio.jmod
55-
rsc:jvm/openjdk-17.0.6/jmods/java.sql.jmod
56-
rsc:jvm/openjdk-17.0.6/jmods/java.sql.rowset.jmod
57-
rsc:jvm/openjdk-17.0.6/jmods/java.transaction.xa.jmod
58-
rsc:jvm/openjdk-17.0.6/jmods/java.xml.crypto.jmod
59-
rsc:jvm/openjdk-17.0.6/jmods/java.xml.jmod
60-
rsc:jvm/openjdk-17.0.6/jmods/jdk.accessibility.jmod
61-
rsc:jvm/openjdk-17.0.6/jmods/jdk.attach.jmod
62-
rsc:jvm/openjdk-17.0.6/jmods/jdk.charsets.jmod
63-
rsc:jvm/openjdk-17.0.6/jmods/jdk.compiler.jmod
64-
rsc:jvm/openjdk-17.0.6/jmods/jdk.crypto.cryptoki.jmod
65-
rsc:jvm/openjdk-17.0.6/jmods/jdk.crypto.ec.jmod
66-
rsc:jvm/openjdk-17.0.6/jmods/jdk.dynalink.jmod
67-
rsc:jvm/openjdk-17.0.6/jmods/jdk.editpad.jmod
68-
rsc:jvm/openjdk-17.0.6/jmods/jdk.httpserver.jmod
69-
rsc:jvm/openjdk-17.0.6/jmods/jdk.incubator.foreign.jmod
70-
rsc:jvm/openjdk-17.0.6/jmods/jdk.incubator.vector.jmod
71-
rsc:jvm/openjdk-17.0.6/jmods/jdk.internal.ed.jmod
72-
rsc:jvm/openjdk-17.0.6/jmods/jdk.internal.jvmstat.jmod
73-
rsc:jvm/openjdk-17.0.6/jmods/jdk.internal.le.jmod
74-
rsc:jvm/openjdk-17.0.6/jmods/jdk.internal.opt.jmod
75-
rsc:jvm/openjdk-17.0.6/jmods/jdk.jartool.jmod
76-
rsc:jvm/openjdk-17.0.6/jmods/jdk.javadoc.jmod
77-
rsc:jvm/openjdk-17.0.6/jmods/jdk.jcmd.jmod
78-
rsc:jvm/openjdk-17.0.6/jmods/jdk.jconsole.jmod
79-
rsc:jvm/openjdk-17.0.6/jmods/jdk.jdeps.jmod
80-
rsc:jvm/openjdk-17.0.6/jmods/jdk.jdi.jmod
81-
rsc:jvm/openjdk-17.0.6/jmods/jdk.jdwp.agent.jmod
82-
rsc:jvm/openjdk-17.0.6/jmods/jdk.jfr.jmod
83-
rsc:jvm/openjdk-17.0.6/jmods/jdk.jlink.jmod
84-
rsc:jvm/openjdk-17.0.6/jmods/jdk.jpackage.jmod
85-
rsc:jvm/openjdk-17.0.6/jmods/jdk.jshell.jmod
86-
rsc:jvm/openjdk-17.0.6/jmods/jdk.jsobject.jmod
87-
rsc:jvm/openjdk-17.0.6/jmods/jdk.jstatd.jmod
88-
rsc:jvm/openjdk-17.0.6/jmods/jdk.localedata.jmod
89-
rsc:jvm/openjdk-17.0.6/jmods/jdk.management.agent.jmod
90-
rsc:jvm/openjdk-17.0.6/jmods/jdk.management.jfr.jmod
91-
rsc:jvm/openjdk-17.0.6/jmods/jdk.management.jmod
92-
rsc:jvm/openjdk-17.0.6/jmods/jdk.naming.dns.jmod
93-
rsc:jvm/openjdk-17.0.6/jmods/jdk.naming.rmi.jmod
94-
rsc:jvm/openjdk-17.0.6/jmods/jdk.net.jmod
95-
rsc:jvm/openjdk-17.0.6/jmods/jdk.nio.mapmode.jmod
96-
rsc:jvm/openjdk-17.0.6/jmods/jdk.random.jmod
97-
rsc:jvm/openjdk-17.0.6/jmods/jdk.sctp.jmod
98-
rsc:jvm/openjdk-17.0.6/jmods/jdk.security.auth.jmod
99-
rsc:jvm/openjdk-17.0.6/jmods/jdk.security.jgss.jmod
100-
rsc:jvm/openjdk-17.0.6/jmods/jdk.unsupported.desktop.jmod
101-
rsc:jvm/openjdk-17.0.6/jmods/jdk.unsupported.jmod
102-
rsc:jvm/openjdk-17.0.6/jmods/jdk.xml.dom.jmod
103-
rsc:jvm/openjdk-17.0.6/jmods/jdk.zipfs.jmod
104-
rsc:jvm/openjdk-17.0.6/legal/
105-
rsc:jvm/openjdk-17.0.6/lib/ct.sym
106-
bin:jvm/openjdk-17.0.6/lib/jexec
107-
rsc:jvm/openjdk-17.0.6/lib/jfr/default.jfc
108-
rsc:jvm/openjdk-17.0.6/lib/jfr/profile.jfc
109-
rsc:jvm/openjdk-17.0.6/lib/jrt-fs.jar
110-
bin:jvm/openjdk-17.0.6/lib/jspawnhelper
111-
rsc:jvm/openjdk-17.0.6/lib/jvm.cfg
112-
lib:jvm/openjdk-17.0.6/lib/libattach.so
113-
lib:jvm/openjdk-17.0.6/lib/libawt.so
114-
lib:jvm/openjdk-17.0.6/lib/libawt_headless.so
115-
lib:jvm/openjdk-17.0.6/lib/libdt_socket.so
116-
lib:jvm/openjdk-17.0.6/lib/libextnet.so
117-
lib:jvm/openjdk-17.0.6/lib/libfontmanager.so
118-
lib:jvm/openjdk-17.0.6/lib/libinstrument.so
119-
lib:jvm/openjdk-17.0.6/lib/libj2gss.so
120-
lib:jvm/openjdk-17.0.6/lib/libj2pcsc.so
121-
lib:jvm/openjdk-17.0.6/lib/libj2pkcs11.so
122-
lib:jvm/openjdk-17.0.6/lib/libjaas.so
123-
lib:jvm/openjdk-17.0.6/lib/libjava.so
124-
lib:jvm/openjdk-17.0.6/lib/libjavajpeg.so
125-
lib:jvm/openjdk-17.0.6/lib/libjawt.so
126-
lib:jvm/openjdk-17.0.6/lib/libjdwp.so
127-
lib:jvm/openjdk-17.0.6/lib/libjimage.so
128-
lib:jvm/openjdk-17.0.6/lib/libjli.so
129-
lib:jvm/openjdk-17.0.6/lib/libjsig.so
130-
lib:jvm/openjdk-17.0.6/lib/libjsound.so
131-
lib:jvm/openjdk-17.0.6/lib/liblcms.so
132-
lib:jvm/openjdk-17.0.6/lib/libmanagement.so
133-
lib:jvm/openjdk-17.0.6/lib/libmanagement_agent.so
134-
lib:jvm/openjdk-17.0.6/lib/libmanagement_ext.so
135-
lib:jvm/openjdk-17.0.6/lib/libmlib_image.so
136-
lib:jvm/openjdk-17.0.6/lib/libnet.so
137-
lib:jvm/openjdk-17.0.6/lib/libnio.so
138-
lib:jvm/openjdk-17.0.6/lib/libprefs.so
139-
lib:jvm/openjdk-17.0.6/lib/librmi.so
140-
lib:jvm/openjdk-17.0.6/lib/libsctp.so
141-
lib:jvm/openjdk-17.0.6/lib/libsyslookup.so
142-
lib:jvm/openjdk-17.0.6/lib/libverify.so
143-
lib:jvm/openjdk-17.0.6/lib/libzip.so
144-
rsc:jvm/openjdk-17.0.6/lib/modules
145-
rsc:jvm/openjdk-17.0.6/lib/psfont.properties.ja
146-
rsc:jvm/openjdk-17.0.6/lib/psfontj2d.properties
147-
rsc:jvm/openjdk-17.0.6/lib/security/blocked.certs
148-
rsc:jvm/openjdk-17.0.6/lib/security/cacerts
149-
rsc:jvm/openjdk-17.0.6/lib/security/default.policy
150-
rsc:jvm/openjdk-17.0.6/lib/security/public_suffix_list.dat
151-
lib:jvm/openjdk-17.0.6/lib/server/libjsig.so
152-
lib:jvm/openjdk-17.0.6/lib/server/libjvm.so
153-
rsc:jvm/openjdk-17.0.6/lib/tzdb.dat
154-
rsc:jvm/openjdk-17.0.6/release
155-
rsc:jvm/openjdk-17.0.6/LICENSE
156-
rsc:jvm/openjdk-17.0.6/ADDITIONAL_LICENSE_INFO
157-
rsc:jvm/openjdk-17.0.6/ASSEMBLY_EXCEPTION
29+
bin:jvm/openjdk-17.0.16/bin/
30+
rsc:jvm/openjdk-17.0.16/conf/
31+
rsc:jvm/openjdk-17.0.16/include/classfile_constants.h
32+
rsc:jvm/openjdk-17.0.16/include/jawt.h
33+
rsc:jvm/openjdk-17.0.16/include/jdwpTransport.h
34+
rsc:jvm/openjdk-17.0.16/include/jni.h
35+
rsc:jvm/openjdk-17.0.16/include/jvmti.h
36+
rsc:jvm/openjdk-17.0.16/include/jvmticmlr.h
37+
rsc:jvm/openjdk-17.0.16/include/linux/jawt_md.h
38+
rsc:jvm/openjdk-17.0.16/include/linux/jni_md.h
39+
rsc:jvm/openjdk-17.0.16/jmods/java.base.jmod
40+
rsc:jvm/openjdk-17.0.16/jmods/java.compiler.jmod
41+
rsc:jvm/openjdk-17.0.16/jmods/java.datatransfer.jmod
42+
rsc:jvm/openjdk-17.0.16/jmods/java.desktop.jmod
43+
rsc:jvm/openjdk-17.0.16/jmods/java.instrument.jmod
44+
rsc:jvm/openjdk-17.0.16/jmods/java.logging.jmod
45+
rsc:jvm/openjdk-17.0.16/jmods/java.management.jmod
46+
rsc:jvm/openjdk-17.0.16/jmods/java.management.rmi.jmod
47+
rsc:jvm/openjdk-17.0.16/jmods/java.naming.jmod
48+
rsc:jvm/openjdk-17.0.16/jmods/java.net.http.jmod
49+
rsc:jvm/openjdk-17.0.16/jmods/java.prefs.jmod
50+
rsc:jvm/openjdk-17.0.16/jmods/java.rmi.jmod
51+
rsc:jvm/openjdk-17.0.16/jmods/java.scripting.jmod
52+
rsc:jvm/openjdk-17.0.16/jmods/java.se.jmod
53+
rsc:jvm/openjdk-17.0.16/jmods/java.security.jgss.jmod
54+
rsc:jvm/openjdk-17.0.16/jmods/java.security.sasl.jmod
55+
rsc:jvm/openjdk-17.0.16/jmods/java.smartcardio.jmod
56+
rsc:jvm/openjdk-17.0.16/jmods/java.sql.jmod
57+
rsc:jvm/openjdk-17.0.16/jmods/java.sql.rowset.jmod
58+
rsc:jvm/openjdk-17.0.16/jmods/java.transaction.xa.jmod
59+
rsc:jvm/openjdk-17.0.16/jmods/java.xml.crypto.jmod
60+
rsc:jvm/openjdk-17.0.16/jmods/java.xml.jmod
61+
rsc:jvm/openjdk-17.0.16/jmods/jdk.accessibility.jmod
62+
rsc:jvm/openjdk-17.0.16/jmods/jdk.attach.jmod
63+
rsc:jvm/openjdk-17.0.16/jmods/jdk.charsets.jmod
64+
rsc:jvm/openjdk-17.0.16/jmods/jdk.compiler.jmod
65+
rsc:jvm/openjdk-17.0.16/jmods/jdk.crypto.cryptoki.jmod
66+
rsc:jvm/openjdk-17.0.16/jmods/jdk.crypto.ec.jmod
67+
rsc:jvm/openjdk-17.0.16/jmods/jdk.dynalink.jmod
68+
rsc:jvm/openjdk-17.0.16/jmods/jdk.editpad.jmod
69+
rsc:jvm/openjdk-17.0.16/jmods/jdk.httpserver.jmod
70+
rsc:jvm/openjdk-17.0.16/jmods/jdk.incubator.foreign.jmod
71+
rsc:jvm/openjdk-17.0.16/jmods/jdk.incubator.vector.jmod
72+
rsc:jvm/openjdk-17.0.16/jmods/jdk.internal.ed.jmod
73+
rsc:jvm/openjdk-17.0.16/jmods/jdk.internal.jvmstat.jmod
74+
rsc:jvm/openjdk-17.0.16/jmods/jdk.internal.le.jmod
75+
rsc:jvm/openjdk-17.0.16/jmods/jdk.internal.opt.jmod
76+
rsc:jvm/openjdk-17.0.16/jmods/jdk.jartool.jmod
77+
rsc:jvm/openjdk-17.0.16/jmods/jdk.javadoc.jmod
78+
rsc:jvm/openjdk-17.0.16/jmods/jdk.jcmd.jmod
79+
rsc:jvm/openjdk-17.0.16/jmods/jdk.jconsole.jmod
80+
rsc:jvm/openjdk-17.0.16/jmods/jdk.jdeps.jmod
81+
rsc:jvm/openjdk-17.0.16/jmods/jdk.jdi.jmod
82+
rsc:jvm/openjdk-17.0.16/jmods/jdk.jdwp.agent.jmod
83+
rsc:jvm/openjdk-17.0.16/jmods/jdk.jfr.jmod
84+
rsc:jvm/openjdk-17.0.16/jmods/jdk.jlink.jmod
85+
rsc:jvm/openjdk-17.0.16/jmods/jdk.jpackage.jmod
86+
rsc:jvm/openjdk-17.0.16/jmods/jdk.jshell.jmod
87+
rsc:jvm/openjdk-17.0.16/jmods/jdk.jsobject.jmod
88+
rsc:jvm/openjdk-17.0.16/jmods/jdk.jstatd.jmod
89+
rsc:jvm/openjdk-17.0.16/jmods/jdk.localedata.jmod
90+
rsc:jvm/openjdk-17.0.16/jmods/jdk.management.agent.jmod
91+
rsc:jvm/openjdk-17.0.16/jmods/jdk.management.jfr.jmod
92+
rsc:jvm/openjdk-17.0.16/jmods/jdk.management.jmod
93+
rsc:jvm/openjdk-17.0.16/jmods/jdk.naming.dns.jmod
94+
rsc:jvm/openjdk-17.0.16/jmods/jdk.naming.rmi.jmod
95+
rsc:jvm/openjdk-17.0.16/jmods/jdk.net.jmod
96+
rsc:jvm/openjdk-17.0.16/jmods/jdk.nio.mapmode.jmod
97+
rsc:jvm/openjdk-17.0.16/jmods/jdk.random.jmod
98+
rsc:jvm/openjdk-17.0.16/jmods/jdk.sctp.jmod
99+
rsc:jvm/openjdk-17.0.16/jmods/jdk.security.auth.jmod
100+
rsc:jvm/openjdk-17.0.16/jmods/jdk.security.jgss.jmod
101+
rsc:jvm/openjdk-17.0.16/jmods/jdk.unsupported.desktop.jmod
102+
rsc:jvm/openjdk-17.0.16/jmods/jdk.unsupported.jmod
103+
rsc:jvm/openjdk-17.0.16/jmods/jdk.xml.dom.jmod
104+
rsc:jvm/openjdk-17.0.16/jmods/jdk.zipfs.jmod
105+
rsc:jvm/openjdk-17.0.16/legal/
106+
rsc:jvm/openjdk-17.0.16/lib/ct.sym
107+
bin:jvm/openjdk-17.0.16/lib/jexec
108+
rsc:jvm/openjdk-17.0.16/lib/jfr/default.jfc
109+
rsc:jvm/openjdk-17.0.16/lib/jfr/profile.jfc
110+
rsc:jvm/openjdk-17.0.16/lib/jrt-fs.jar
111+
bin:jvm/openjdk-17.0.16/lib/jspawnhelper
112+
rsc:jvm/openjdk-17.0.16/lib/jvm.cfg
113+
lib:jvm/openjdk-17.0.16/lib/libattach.so
114+
lib:jvm/openjdk-17.0.16/lib/libawt.so
115+
lib:jvm/openjdk-17.0.16/lib/libawt_headless.so
116+
lib:jvm/openjdk-17.0.16/lib/libdt_socket.so
117+
lib:jvm/openjdk-17.0.16/lib/libextnet.so
118+
lib:jvm/openjdk-17.0.16/lib/libfontmanager.so
119+
lib:jvm/openjdk-17.0.16/lib/libinstrument.so
120+
lib:jvm/openjdk-17.0.16/lib/libj2gss.so
121+
lib:jvm/openjdk-17.0.16/lib/libj2pcsc.so
122+
lib:jvm/openjdk-17.0.16/lib/libj2pkcs11.so
123+
lib:jvm/openjdk-17.0.16/lib/libjaas.so
124+
lib:jvm/openjdk-17.0.16/lib/libjava.so
125+
lib:jvm/openjdk-17.0.16/lib/libjavajpeg.so
126+
lib:jvm/openjdk-17.0.16/lib/libjawt.so
127+
lib:jvm/openjdk-17.0.16/lib/libjdwp.so
128+
lib:jvm/openjdk-17.0.16/lib/libjimage.so
129+
lib:jvm/openjdk-17.0.16/lib/libjli.so
130+
lib:jvm/openjdk-17.0.16/lib/libjsig.so
131+
lib:jvm/openjdk-17.0.16/lib/libjsound.so
132+
lib:jvm/openjdk-17.0.16/lib/libjsvml.so
133+
lib:jvm/openjdk-17.0.16/lib/liblcms.so
134+
lib:jvm/openjdk-17.0.16/lib/libmanagement.so
135+
lib:jvm/openjdk-17.0.16/lib/libmanagement_agent.so
136+
lib:jvm/openjdk-17.0.16/lib/libmanagement_ext.so
137+
lib:jvm/openjdk-17.0.16/lib/libmlib_image.so
138+
lib:jvm/openjdk-17.0.16/lib/libnet.so
139+
lib:jvm/openjdk-17.0.16/lib/libnio.so
140+
lib:jvm/openjdk-17.0.16/lib/libprefs.so
141+
lib:jvm/openjdk-17.0.16/lib/librmi.so
142+
lib:jvm/openjdk-17.0.16/lib/libsaproc.so
143+
lib:jvm/openjdk-17.0.16/lib/libsctp.so
144+
lib:jvm/openjdk-17.0.16/lib/libsyslookup.so
145+
lib:jvm/openjdk-17.0.16/lib/libverify.so
146+
lib:jvm/openjdk-17.0.16/lib/libzip.so
147+
rsc:jvm/openjdk-17.0.16/lib/modules
148+
rsc:jvm/openjdk-17.0.16/lib/psfont.properties.ja
149+
rsc:jvm/openjdk-17.0.16/lib/psfontj2d.properties
150+
rsc:jvm/openjdk-17.0.16/lib/security/blocked.certs
151+
rsc:jvm/openjdk-17.0.16/lib/security/cacerts
152+
rsc:jvm/openjdk-17.0.16/lib/security/default.policy
153+
rsc:jvm/openjdk-17.0.16/lib/security/public_suffix_list.dat
154+
lib:jvm/openjdk-17.0.16/lib/server/libjsig.so
155+
lib:jvm/openjdk-17.0.16/lib/server/libjvm.so
156+
rsc:jvm/openjdk-17.0.16/lib/tzdb.dat
157+
rsc:jvm/openjdk-17.0.16/release
158+
rsc:jvm/openjdk-17.0.16/LICENSE
159+
rsc:jvm/openjdk-17.0.16/ADDITIONAL_LICENSE_INFO
160+
rsc:jvm/openjdk-17.0.16/ASSEMBLY_EXCEPTION

‎cross/java-17-openjdk/digests

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
jdk-17.0.6+10.tar.gz SHA1 356707bdb2b4bc6811d6392295cb7b6522dbf6ab
2-
jdk-17.0.6+10.tar.gz SHA256 331bad1f80e98761eb9692863146fec647db573db5a5efa5b9bd6326d53a3472
3-
jdk-17.0.6+10.tar.gz MD5 ab73f8d93b1529dd6e4b4b0caf72adda
1+
jdk-17.0.16+7.tar.gz SHA1 6c44da5d3530c0c9015928e27480167d2f7b8539
2+
jdk-17.0.16+7.tar.gz SHA256 8cffff33956b4c9b8aa685f223a9eaa8b90fc7170b75ae2e575256602013f482
3+
jdk-17.0.16+7.tar.gz MD5 f8875a4277cfe8b3b599a1305f7a1bf2

‎cross/java-17-openjdk/patches/012.jtreg-location.patch

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,17 @@
1-
--- a/make/autoconf/toolchain.m4
2-
+++ b/make/autoconf/toolchain.m4
3-
@@ -1029,7 +1029,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG],
4-
AC_MSG_ERROR([jtreg home directory from --with-jtreg=$with_jtreg does not exist])
5-
fi
6-
7-
- if test ! -e "$JT_HOME/lib/jtreg.jar"; then
8-
+ if test ! -e "$JT_HOME/lib/jtreg.jar" && test ! -e "$JT_HOME/share/java/jtreg.jar"; then
9-
AC_MSG_ERROR([jtreg home directory from --with-jtreg=$with_jtreg is not a valid jtreg home])
10-
fi
11-
12-
@@ -1043,7 +1043,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG],
13-
AC_MSG_WARN([Ignoring JT_HOME pointing to invalid directory: $JT_HOME])
14-
JT_HOME=
15-
else
16-
- if test ! -e "$JT_HOME/lib/jtreg.jar"; then
17-
+ if test ! -e "$JT_HOME/lib/jtreg.jar" && test ! -e "$JT_HOME/share/java/jtreg.jar"; then
18-
AC_MSG_WARN([Ignoring JT_HOME which is not a valid jtreg home: $JT_HOME])
19-
JT_HOME=
20-
else
21-
@@ -1059,7 +1059,7 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_JTREG],
22-
if test "x$JTREGEXE" != x; then
23-
# That's good, now try to derive JT_HOME
24-
JT_HOME=`(cd $($DIRNAME $JTREGEXE)/.. && pwd)`
25-
- if test ! -e "$JT_HOME/lib/jtreg.jar"; then
26-
+ if test ! -e "$JT_HOME/lib/jtreg.jar" && test ! -e "$JT_HOME/share/java/jtreg.jar"; then
27-
AC_MSG_WARN([Ignoring jtreg from path since a valid jtreg home cannot be found])
28-
JT_HOME=
29-
else
301
--- a/make/RunTests.gmk
312
+++ b/make/RunTests.gmk
32-
@@ -846,7 +846,7 @@ define SetupRunJtregTestBody
3+
@@ -880,7 +880,7 @@
334

345
$1_COMMAND_LINE := \
35-
$$(JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
6+
$$(JTREG_JAVA) $$($1_JTREG_LAUNCHER_OPTIONS) \
367
- -Dprogram=jtreg -jar $$(JT_HOME)/lib/jtreg.jar \
378
+ -Dprogram=jtreg -jar $$(if $$(wildcard $$(JT_HOME)/lib/jtreg.jar),$$(JT_HOME)/lib/jtreg.jar,$$(JT_HOME)/share/java/jtreg.jar) \
389
$$($1_JTREG_BASIC_OPTIONS) \
3910
-testjdk:$$(JDK_UNDER_TEST) \
4011
-dir:$$(JTREG_TOPDIR) \
4112
--- a/make/test/BuildFailureHandler.gmk
4213
+++ b/make/test/BuildFailureHandler.gmk
43-
@@ -38,7 +38,7 @@ FH_BASEDIR := $(TOPDIR)/test/failure_han
14+
@@ -38,7 +38,7 @@
4415
FH_SUPPORT := $(SUPPORT_OUTPUTDIR)/test/failure_handler
4516
FH_JAR := $(FH_SUPPORT)/jtregFailureHandler.jar
4617

‎cross/java-17-openjdk/patches/030.riscv64.patch

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,3 @@ Reviewed-by: aph, erikj, ehelin, ihse
5656

5757
echo $result
5858
exit $exitcode
59-
--- a/src/hotspot/os/linux/os_linux.cpp
60-
+++ b/src/hotspot/os/linux/os_linux.cpp
61-
@@ -2558,6 +2558,8 @@
62-
strncpy(cpuinfo, "IA64", length);
63-
#elif defined(PPC)
64-
strncpy(cpuinfo, "PPC64", length);
65-
+#elif defined(RISCV)
66-
+ strncpy(cpuinfo, "RISCV", length);
67-
#elif defined(S390)
68-
strncpy(cpuinfo, "S390", length);
69-
#elif defined(SPARC)

0 commit comments

Comments
 (0)