jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

openjdk8: update to 8u322b04, enable debug.

Browse source
This commit is contained in:
classabbyamp 2022-04-20 22:12:21 -04:00 committed by Leah Neukirchen
parent 39376c4c17
commit 2e10e481fe
4 changed files with 77 additions and 159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
srcpkgs/openjdk8/patches/006_8197981-pr3548.patch
View file

@ -1,32 +0,0 @@
# HG changeset patch
# User andrew
# Date 1518667645 0
# Thu Feb 15 04:07:25 2018 +0000
# Node ID 1d35411eb7bdf16191e220ffe3b1dc4d5d0c6041
# Parent 999983606f5c61b093c6f6316a7b26c4cd4ca79e
8197981, PR3548: Missing return statement in __sync_val_compare_and_swap_8
Summary: Fix issue discovered by -Wreturn-type on systems without LP64.
Reviewed-by: aph
diff --git openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
--- openjdk.orig/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
+++ openjdk/hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp
@@ -457,6 +457,7 @@
long long unsigned int oldval,
long long unsigned int newval) {
ShouldNotCallThis();
+ return 0;
}
};
#endif // !_LP64
diff --git openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
--- openjdk.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
+++ openjdk/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
@@ -498,6 +498,7 @@
long long unsigned int oldval,
long long unsigned int newval) {
ShouldNotCallThis();
+ return 0;
}
};
#endif // !_LP64

33
srcpkgs/openjdk8/patches/010_pr1869.patch
View file

@ -1,33 +0,0 @@
# HG changeset patch
# User andrew
# Date 1405461315 -3600
# Tue Jul 15 22:55:15 2014 +0100
# Node ID 967ae4d849eb20b4b63c399bc3f376dfc0f9d2cc
# Parent 84854c983fd81cf1a1598f8c069a2db010abc05c
PR1869: Avoid x86 workaround when running Zero rather than a JIT
Contributed-by: Matthias Klose <doko@ubuntu.com>
diff -Nru openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp
--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2019-04-11 03:36:49.000000000 +0100
+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2019-04-19 17:15:35.194017652 +0100
@@ -5139,7 +5139,7 @@
Linux::capture_initial_stack(JavaThread::stack_size_at_create());
-#if defined(IA32)
+#if defined(IA32) && !defined(ZERO)
workaround_expand_exec_shield_cs_limit();
#endif
diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp
--- openjdk.orig/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 2019-04-11 03:36:49.000000000 +0100
+++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp 2019-04-19 17:15:58.329656663 +0100
@@ -890,7 +890,7 @@
* updates (JDK-8023956).
*/
void os::workaround_expand_exec_shield_cs_limit() {
-#if defined(IA32)
+#if defined(IA32) && !defined(ZERO)
size_t page_size = os::vm_page_size();
/*

10
srcpkgs/openjdk8/patches/999-native-no-sysroot.patch
View file

@ -2,11 +2,9 @@ By default, OpenJDK 8 passes sysroot flags to native compiler. This is wrong,
as it will then use target include files when calling the native compiler.
Newer versions of OpenJDK have seemingly fixed this, 8 has not.
diff --git a/make/common/NativeCompilation.gmk b/make/common/NativeCompilation.gmk
index d961cf3..9679f97 100644
--- a/make/common/NativeCompilation.gmk
+++ b/make/common/NativeCompilation.gmk
@@ -383,10 +383,6 @@ define SetupNativeCompilation
@@ -384,10 +384,6 @@
$$(error Unknown value for OPTIMIZATION: $$($1_OPTIMIZATION))
endif
@ -17,12 +15,12 @@ index d961cf3..9679f97 100644
# Now call add_native_source for each source file we are going to compile.
$$(foreach p,$$($1_SRCS), \
$$(eval $$(call add_native_source,$1,$$p,$$($1_OBJECT_DIR), \
@@ -432,8 +428,6 @@ define SetupNativeCompilation
@@ -433,8 +429,6 @@
$1_EXTRA_LDFLAGS += $(call SET_SHARED_LIBRARY_MAPFILE,$$($1_REAL_MAPFILE))
endif
- $1_EXTRA_LDFLAGS += $(SYSROOT_LDFLAGS)
-
# Need to make sure TARGET is first on list
$1 := $$($1_TARGET)
ifneq (,$$($1_LIBRARY))
# Generating a dynamic library.
ifeq ($$($1_STATIC_LIBRARY),)

161
srcpkgs/openjdk8/template
View file

@ -3,13 +3,12 @@
# TODO: make -headless versions
# TODO: config files?
pkgname=openjdk8
version=8u272b02
version=8u322b04
revision=1
_jdk_update=272
_jdk_update="${version#*u}"
_jdk_update="${_jdk_update%b*}"
_jdk_build="${version#*b}"
_final_jdk_home="usr/lib/jvm/java-1.8-openjdk"
_jdk_home="usr/lib/jvm/java-1.8-openjdk"
# we're using aarch64 port repo to get aarch64 JIT; the repo is
# otherwise the same as the normal one, just with aarch64 port added
_repo_ver="aarch64-shenandoah-jdk${version/b/-b}"
@ -19,6 +18,8 @@ configure_args="
--prefix=${XBPS_DESTDIR}/${XBPS_CROSS_TRIPLET}/${pkgname}-${version}/usr/lib
--with-update-version=${_jdk_update}
--with-build-number=b${_jdk_build}
--with-debug-level=release
--with-native-debug-symbols=internal
--with-milestone=fcs
--enable-unlimited-crypto
--with-zlib=system
@ -53,14 +54,14 @@ distfiles="
http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools/archive/${_repo_ver}.tar.gz>langtools-${_repo_ver}.tar.gz
http://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn/archive/${_repo_ver}.tar.gz>nashorn-${_repo_ver}.tar.gz"
checksum="bb931ea723a8b6c418ef6a8dc7b33c9a082ce240f607e33d260951bdc52d1294
655a3f4875f4ea4d6d7083c65e3bffbd694114af25a7e25bb4276c63f606328d
2c6bc905ffe04659e89806514f10848e4ff548209c8e4407a5f37a3358a8cb78
9543a96eb3f60171cebbf0652190942c0b0a78560fae19c7c7aff7a72e14daa5
7a610a834483650660a98828420cd3bb36f17e077cc0eaf30c4d01db97ee0efd
330f52d045993ca98f6c6376bb67e5c085937553db80fd21503129f9fcdd144d
04d6b61009f7373c49a5381281cae2d4c06d4c5bc42991b3bccfb8b820b95bba
48aac240d50cb3fa651b2299b6add1376f31624fd7666b74ba23761bb535fab7"
checksum="1b93adf81488be199243f684398d616c20e68bd3bef990d9eafb3d607ab3d02e
03a7e0fc8ce0ed938c80c69890812e1dbad423df1718115e28f930908a9b5f9b
2213194f9b3aef81340710ca63fd00fbabc42a82b6b30d6955640e66293ab497
80646bf709598067622227c982efdbd88b3c6e8da0024e6f9a264145d942a99c
8c8fc97a8c056cc520472d292b85dbe25a7edbfa4545a8c45275b7b378b0fb65
2d659ba2c64b19dba192ed1be1e6033efb7445809f8e6966439619a417975a73
16cc13cc5234ac1ed3dcebc8c8586a4e31b43cf5c9a4b496fd1f29279fa6b827
68357e18386d833a882a9a988bf4535e5ce8dfa90beeeed7a1939aa75c0e991f"
build_options="docs"
desc_option_docs="Build documentation"
@ -81,75 +82,59 @@ fi
provides="java-environment-${version}_1"
if [ -n "$XBPS_DEBUG_PKGS" ]; then
configure_args+=" --with-native-debug-symbols=internal"
fi
if [ ! "$CROSS_BUILD" ]; then
hostmakedepends+=" openjdk7-bootstrap"
configure_args+=" --with-boot-jdk=/usr/lib/jvm/java-1.7-openjdk"
else
hostmakedepends+=" openjdk8"
configure_args+=" --with-boot-jdk=/${_final_jdk_home}"
configure_args+=" --with-boot-jdk=/${_jdk_home}"
fi
# enabling ccache segfaults gcc
export CCACHE_DISABLE=1
alternatives="
java:/usr/bin/java:/${_final_jdk_home}/bin/java
java:/usr/bin/jjs:/${_final_jdk_home}/bin/jjs
java:/usr/bin/keytool:/${_final_jdk_home}/bin/keytool
java:/usr/bin/orbd:/${_final_jdk_home}/bin/orbd
java:/usr/bin/pack200:/${_final_jdk_home}/bin/pack200
java:/usr/bin/policytool:/${_final_jdk_home}/bin/policytool
java:/usr/bin/rmid:/${_final_jdk_home}/bin/rmid
java:/usr/bin/rmiregistry:/${_final_jdk_home}/bin/rmiregistry
java:/usr/bin/servertool:/${_final_jdk_home}/bin/servertool
java:/usr/bin/tnameserv:/${_final_jdk_home}/bin/tnameserv
java:/usr/bin/unpack200:/${_final_jdk_home}/bin/unpack200
jdk:/usr/bin/appletviewer:/${_final_jdk_home}/bin/appletviewer
jdk:/usr/bin/extcheck:/${_final_jdk_home}/bin/extcheck
jdk:/usr/bin/idlj:/${_final_jdk_home}/bin/idlj
jdk:/usr/bin/jar:/${_final_jdk_home}/bin/jar
jdk:/usr/bin/jarsigner:/${_final_jdk_home}/bin/jarsigner
jdk:/usr/bin/java:/${_final_jdk_home}/bin/java
jdk:/usr/bin/java-rmi.cgi:/${_final_jdk_home}/bin/java-rmi.cgi
jdk:/usr/bin/javac:/${_final_jdk_home}/bin/javac
jdk:/usr/bin/javadoc:/${_final_jdk_home}/bin/javadoc
jdk:/usr/bin/javah:/${_final_jdk_home}/bin/javah
jdk:/usr/bin/javap:/${_final_jdk_home}/bin/javap
jdk:/usr/bin/jcmd:/${_final_jdk_home}/bin/jcmd
jdk:/usr/bin/jconsole:/${_final_jdk_home}/bin/jconsole
jdk:/usr/bin/jdb:/${_final_jdk_home}/bin/jdb
jdk:/usr/bin/jdeps:/${_final_jdk_home}/bin/jdeps
jdk:/usr/bin/jhat:/${_final_jdk_home}/bin/jhat
jdk:/usr/bin/jinfo:/${_final_jdk_home}/bin/jinfo
jdk:/usr/bin/jjs:/${_final_jdk_home}/bin/jjs
jdk:/usr/bin/jmap:/${_final_jdk_home}/bin/jmap
jdk:/usr/bin/jps:/${_final_jdk_home}/bin/jps
jdk:/usr/bin/jrunscript:/${_final_jdk_home}/bin/jrunscript
jdk:/usr/bin/jsadebugd:/${_final_jdk_home}/bin/jsadebugd
jdk:/usr/bin/jstack:/${_final_jdk_home}/bin/jstack
jdk:/usr/bin/jstat:/${_final_jdk_home}/bin/jstat
jdk:/usr/bin/jstatd:/${_final_jdk_home}/bin/jstatd
jdk:/usr/bin/keytool:/${_final_jdk_home}/bin/keytool
jdk:/usr/bin/native2ascii:/${_final_jdk_home}/bin/native2ascii
jdk:/usr/bin/orbd:/${_final_jdk_home}/bin/orbd
jdk:/usr/bin/pack200:/${_final_jdk_home}/bin/pack200
jdk:/usr/bin/policytool:/${_final_jdk_home}/bin/policytool
jdk:/usr/bin/rmic:/${_final_jdk_home}/bin/rmic
jdk:/usr/bin/rmid:/${_final_jdk_home}/bin/rmid
jdk:/usr/bin/rmiregistry:/${_final_jdk_home}/bin/rmiregistry
jdk:/usr/bin/schemagen:/${_final_jdk_home}/bin/schemagen
jdk:/usr/bin/serialver:/${_final_jdk_home}/bin/serialver
jdk:/usr/bin/servertool:/${_final_jdk_home}/bin/servertool
jdk:/usr/bin/tnameserv:/${_final_jdk_home}/bin/tnameserv
jdk:/usr/bin/unpack200:/${_final_jdk_home}/bin/unpack200
jdk:/usr/bin/wsgen:/${_final_jdk_home}/bin/wsgen
jdk:/usr/bin/wsimport:/${_final_jdk_home}/bin/wsimport
jdk:/usr/bin/xjc:/${_final_jdk_home}/bin/xjc
jdk:/usr/bin/appletviewer:/${_jdk_home}/bin/appletviewer
jdk:/usr/bin/extcheck:/${_jdk_home}/bin/extcheck
jdk:/usr/bin/idlj:/${_jdk_home}/bin/idlj
jdk:/usr/bin/jar:/${_jdk_home}/bin/jar
jdk:/usr/bin/jarsigner:/${_jdk_home}/bin/jarsigner
jdk:/usr/bin/java:/${_jdk_home}/bin/java
jdk:/usr/bin/java-rmi.cgi:/${_jdk_home}/bin/java-rmi.cgi
jdk:/usr/bin/javac:/${_jdk_home}/bin/javac
jdk:/usr/bin/javadoc:/${_jdk_home}/bin/javadoc
jdk:/usr/bin/javah:/${_jdk_home}/bin/javah
jdk:/usr/bin/javap:/${_jdk_home}/bin/javap
jdk:/usr/bin/jcmd:/${_jdk_home}/bin/jcmd
jdk:/usr/bin/jconsole:/${_jdk_home}/bin/jconsole
jdk:/usr/bin/jdb:/${_jdk_home}/bin/jdb
jdk:/usr/bin/jdeps:/${_jdk_home}/bin/jdeps
jdk:/usr/bin/jhat:/${_jdk_home}/bin/jhat
jdk:/usr/bin/jinfo:/${_jdk_home}/bin/jinfo
jdk:/usr/bin/jjs:/${_jdk_home}/bin/jjs
jdk:/usr/bin/jmap:/${_jdk_home}/bin/jmap
jdk:/usr/bin/jps:/${_jdk_home}/bin/jps
jdk:/usr/bin/jrunscript:/${_jdk_home}/bin/jrunscript
jdk:/usr/bin/jsadebugd:/${_jdk_home}/bin/jsadebugd
jdk:/usr/bin/jstack:/${_jdk_home}/bin/jstack
jdk:/usr/bin/jstat:/${_jdk_home}/bin/jstat
jdk:/usr/bin/jstatd:/${_jdk_home}/bin/jstatd
jdk:/usr/bin/keytool:/${_jdk_home}/bin/keytool
jdk:/usr/bin/native2ascii:/${_jdk_home}/bin/native2ascii
jdk:/usr/bin/orbd:/${_jdk_home}/bin/orbd
jdk:/usr/bin/pack200:/${_jdk_home}/bin/pack200
jdk:/usr/bin/policytool:/${_jdk_home}/bin/policytool
jdk:/usr/bin/rmic:/${_jdk_home}/bin/rmic
jdk:/usr/bin/rmid:/${_jdk_home}/bin/rmid
jdk:/usr/bin/rmiregistry:/${_jdk_home}/bin/rmiregistry
jdk:/usr/bin/schemagen:/${_jdk_home}/bin/schemagen
jdk:/usr/bin/serialver:/${_jdk_home}/bin/serialver
jdk:/usr/bin/servertool:/${_jdk_home}/bin/servertool
jdk:/usr/bin/tnameserv:/${_jdk_home}/bin/tnameserv
jdk:/usr/bin/unpack200:/${_jdk_home}/bin/unpack200
jdk:/usr/bin/wsgen:/${_jdk_home}/bin/wsgen
jdk:/usr/bin/wsimport:/${_jdk_home}/bin/wsimport
jdk:/usr/bin/xjc:/${_jdk_home}/bin/xjc
"
post_extract() {
@ -219,11 +204,11 @@ post_install() {
# unify the install prefix
mv ${DESTDIR}/usr/lib/jvm/openjdk-1.8.0_${_jdk_update} \
${DESTDIR}/${_final_jdk_home}
${DESTDIR}/${_jdk_home}
vmkdir ${_final_jdk_home}/lib/security
make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/${_final_jdk_home}/bin/keytool"
mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/${_final_jdk_home}/lib/security/
vmkdir ${_jdk_home}/lib/security
make-ca -g -f --destdir "${PWD}/ca" -k "${DESTDIR}/${_jdk_home}/bin/keytool"
mv ./ca/etc/pki/tls/java/cacerts ${DESTDIR}/${_jdk_home}/lib/security/
chmod -R ugo+rw ./ca
rm -Rf ./ca
@ -237,23 +222,23 @@ openjdk8-jre_package() {
short_desc+=" - runtime components"
provides="java-runtime-${version}_1"
alternatives="
java:/usr/bin/java:/${_final_jdk_home}/jre/bin/java
java:/usr/bin/jjs:/${_final_jdk_home}/jre/bin/jjs
java:/usr/bin/keytool:/${_final_jdk_home}/jre/bin/keytool
java:/usr/bin/orbd:/${_final_jdk_home}/jre/bin/orbd
java:/usr/bin/pack200:/${_final_jdk_home}/jre/bin/pack200
java:/usr/bin/policytool:/${_final_jdk_home}/jre/bin/policytool
java:/usr/bin/rmid:/${_final_jdk_home}/jre/bin/rmid
java:/usr/bin/rmiregistry:/${_final_jdk_home}/jre/bin/rmiregistry
java:/usr/bin/servertool:/${_final_jdk_home}/jre/bin/servertool
java:/usr/bin/tnameserv:/${_final_jdk_home}/jre/bin/tnameserv
java:/usr/bin/unpack200:/${_final_jdk_home}/jre/bin/unpack200
java:/usr/bin/java:/${_jdk_home}/jre/bin/java
java:/usr/bin/jjs:/${_jdk_home}/jre/bin/jjs
java:/usr/bin/keytool:/${_jdk_home}/jre/bin/keytool
java:/usr/bin/orbd:/${_jdk_home}/jre/bin/orbd
java:/usr/bin/pack200:/${_jdk_home}/jre/bin/pack200
java:/usr/bin/policytool:/${_jdk_home}/jre/bin/policytool
java:/usr/bin/rmid:/${_jdk_home}/jre/bin/rmid
java:/usr/bin/rmiregistry:/${_jdk_home}/jre/bin/rmiregistry
java:/usr/bin/servertool:/${_jdk_home}/jre/bin/servertool
java:/usr/bin/tnameserv:/${_jdk_home}/jre/bin/tnameserv
java:/usr/bin/unpack200:/${_jdk_home}/jre/bin/unpack200
"
pkg_install() {
vmove ${_final_jdk_home}/jre
vmove ${_jdk_home}/jre
vmkdir etc/profile.d
cat >>${PKGDESTDIR}/etc/profile.d/10_openjdk8.sh <<EOF
export JAVA_HOME=\${JAVA_HOME=/${_final_jdk_home}/jre}
export JAVA_HOME=\${JAVA_HOME=/${_jdk_home}/jre}
EOF
}
}
@ -264,7 +249,7 @@ openjdk8-src_package() {
noshlibprovides=yes
short_desc+=" - source code"
pkg_install() {
vmove ${_final_jdk_home}/src.zip
vmove ${_jdk_home}/src.zip
}
}
@ -279,6 +264,6 @@ openjdk8-doc_package() {
vmkdir usr/share/doc/openjdk8
cp -a build/linux-*/docs/* ${PKGDESTDIR}/usr/share/doc/openjdk8
fi
vmove ${_final_jdk_home}/man/man1
vmove ${_jdk_home}/man/man1
}
}