Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
97 changes: 97 additions & 0 deletions srcpkgs/openjdk22-bootstrap/template
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
# Template file for 'openjdk22-bootstrap'
pkgname=openjdk22-bootstrap
version=22.0.2+9
revision=1
_gtest_ver=1.14.0
_java_ver="${version%%.*}"
_jdk_update="${version#*+}"
_base_version="${version%+*}"
_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
archs="x86_64* aarch64*"
build_style=gnu-configure
configure_args="--disable-warnings-as-errors
--enable-unlimited-crypto
--with-zlib=system
--with-libjpeg=system
--with-giflib=system
--with-libpng=system
--with-lcms=system
--with-jtreg=no
--with-gtest=./gtest
--with-debug-level=release
--with-native-debug-symbols=internal
--with-jobs=${XBPS_ORIG_MAKEJOBS}
--with-version-pre=
--with-version-build=${_jdk_update}
--with-version-opt=void-r${revision}
--with-vendor-name=Void
--with-vendor-url=https://voidlinux.org/
--with-vendor-bug-url=https://github.com/void-linux/void-packages/issues
--with-vendor-vm-bug-url=https://github.com/void-linux/void-packages/issues
--with-boot-jdk=/usr/lib/jvm/openjdk$(( _java_ver - 1 ))"
make_build_args="images"
make_check_target="test-hotspot-gtest"
hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
openssl zlib-devel which openjdk$(( _java_ver - 1 ))"
makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
fontconfig-devel zlib-devel lcms2-devel"
short_desc="OpenJDK Java Development Kit (bootstrap version ${_java_ver})"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only WITH Classpath-exception-2.0"
homepage="http://openjdk.java.net/"
distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz
https://github.com/google/googletest/archive/refs/tags/v${_gtest_ver}.tar.gz"
checksum="f3bc990ed34dd0c9a1467640a9c654df4375ff948e854038b913abec12be6179
8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7"
nocross=yes
repository=bootstrap

skip_extraction="v${_gtest_ver}.tar.gz"

# Build and check are still parallel, but don't use -jN.
disable_parallel_build=yes
disable_parallel_check=yes

case "$XBPS_TARGET_MACHINE" in
i686*|arm*) broken="Unsupported architecture" ;;
esac

post_extract() {
mkdir -p gtest
vsrcextract -C gtest v${_gtest_ver}.tar.gz
chmod +x configure
}

do_configure() {
CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
CXXFLAGS=${CXXFLAGS/-D_FORTIFY_SOURCE=2/}

# force ELFv2 for ppc64 just in case
case "$XBPS_TARGET_MACHINE" in
ppc64*)
CFLAGS+=" -DABI_ELFv2"
CXXFLAGS+=" -DABI_ELFv2"
;;
esac

configure_args=${configure_args/--with-libtool-sysroot=$XBPS_CROSS_BASE}
if [ "$XBPS_CCACHE" ] && [ -z "$CROSS_BUILD" ]; then
configure_args+=" --enable-ccache"
CC="/usr/bin/cc"
CXX="/usr/bin/c++"
fi
./configure ${configure_args} \
--with-extra-cflags="$CFLAGS" \
--with-extra-cxxflags="$CXXFLAGS" \
--with-extra-ldflags="$LDFLAGS" \
READELF="$READELF" AR="$AR" STRIP="$STRIP" NM="$NM" \
OBJDUMP="$OBJDUMP" OBJCOPY="$OBJCOPY"
}

do_install() {
vmkdir $_jdk_home

vcopy "build/*-release/images/jdk/*" $_jdk_home
rm -rf "${DESTDIR}/$_jdk_home"/lib/src.zip "${DESTDIR}/$_jdk_home"/demo
}
4 changes: 4 additions & 0 deletions srcpkgs/openjdk22-bootstrap/update
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
site="https://github.com/openjdk/jdk22u/tags"
pattern='jdk-\K22\.[\d.+]+(?=\.)'
# don't need to update the bootstrap package
ignore="*"
26 changes: 26 additions & 0 deletions srcpkgs/openjdk23-bootstrap/patches/LFS64.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
diff --git a/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c b/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c
index 95f78ff..c90e99d 100644
--- a/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c
+++ b/src/java.base/linux/native/libnio/fs/LinuxNativeDispatcher.c
@@ -211,7 +211,7 @@ Java_sun_nio_fs_LinuxNativeDispatcher_directCopy0
}

do {
- RESTARTABLE(sendfile64(dst, src, NULL, count), bytes_sent);
+ RESTARTABLE(sendfile(dst, src, NULL, count), bytes_sent);
if (bytes_sent < 0) {
if (errno == EAGAIN)
return IOS_UNAVAILABLE;
diff --git a/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c b/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c
index efbd0ca..02d3c57 100644
--- a/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c
+++ b/src/java.base/linux/native/libnio/ch/FileDispatcherImpl.c
@@ -114,7 +114,7 @@ Java_sun_nio_ch_FileDispatcherImpl_transferTo0(JNIEnv *env, jobject this,
return n;
}

- n = sendfile64(dstFD, srcFD, &offset, (size_t)count);
+ n = sendfile(dstFD, srcFD, &offset, (size_t)count);
if (n < 0) {
if (errno == EAGAIN)
return IOS_UNAVAILABLE;
97 changes: 97 additions & 0 deletions srcpkgs/openjdk23-bootstrap/template
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
# Template file for 'openjdk23-bootstrap'
pkgname=openjdk23-bootstrap
version=23.0.2+7
revision=1
_gtest_ver=1.14.0
_java_ver="${version%%.*}"
_jdk_update="${version#*+}"
_base_version="${version%+*}"
_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
archs="x86_64* aarch64*"
build_style=gnu-configure
configure_args="--disable-warnings-as-errors
--enable-unlimited-crypto
--with-zlib=system
--with-libjpeg=system
--with-giflib=system
--with-libpng=system
--with-lcms=system
--with-jtreg=no
--with-gtest=./gtest
--with-debug-level=release
--with-native-debug-symbols=internal
--with-jobs=${XBPS_ORIG_MAKEJOBS}
--with-version-pre=
--with-version-build=${_jdk_update}
--with-version-opt=void-r${revision}
--with-vendor-name=Void
--with-vendor-url=https://voidlinux.org/
--with-vendor-bug-url=https://github.com/void-linux/void-packages/issues
--with-vendor-vm-bug-url=https://github.com/void-linux/void-packages/issues
--with-boot-jdk=/usr/lib/jvm/openjdk$(( _java_ver - 1 ))"
make_build_args="images"
make_check_target="test-hotspot-gtest"
hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
openssl zlib-devel which openjdk$(( _java_ver - 1 ))-bootstrap"
makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
fontconfig-devel zlib-devel lcms2-devel"
short_desc="OpenJDK Java Development Kit (bootstrap version ${_java_ver})"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only WITH Classpath-exception-2.0"
homepage="http://openjdk.java.net/"
distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz
https://github.com/google/googletest/archive/refs/tags/v${_gtest_ver}.tar.gz"
checksum="a5072191906781fc9b6d70e335ae8d23f008739ce58372b0198025b4ba2fbec6
8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7"
nocross=yes
repository=bootstrap

skip_extraction="v${_gtest_ver}.tar.gz"

# Build and check are still parallel, but don't use -jN.
disable_parallel_build=yes
disable_parallel_check=yes

case "$XBPS_TARGET_MACHINE" in
i686*|arm*) broken="Unsupported architecture" ;;
esac

post_extract() {
mkdir -p gtest
vsrcextract -C gtest v${_gtest_ver}.tar.gz
chmod +x configure
}

do_configure() {
CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
CXXFLAGS=${CXXFLAGS/-D_FORTIFY_SOURCE=2/}

# force ELFv2 for ppc64 just in case
case "$XBPS_TARGET_MACHINE" in
ppc64*)
CFLAGS+=" -DABI_ELFv2"
CXXFLAGS+=" -DABI_ELFv2"
;;
esac

configure_args=${configure_args/--with-libtool-sysroot=$XBPS_CROSS_BASE}
if [ "$XBPS_CCACHE" ] && [ -z "$CROSS_BUILD" ]; then
configure_args+=" --enable-ccache"
CC="/usr/bin/cc"
CXX="/usr/bin/c++"
fi
./configure ${configure_args} \
--with-extra-cflags="$CFLAGS" \
--with-extra-cxxflags="$CXXFLAGS" \
--with-extra-ldflags="$LDFLAGS" \
READELF="$READELF" AR="$AR" STRIP="$STRIP" NM="$NM" \
OBJDUMP="$OBJDUMP" OBJCOPY="$OBJCOPY"
}

do_install() {
vmkdir $_jdk_home

vcopy "build/*-release/images/jdk/*" "${_jdk_home}"
rm -rf "${DESTDIR}/$_jdk_home"/lib/src.zip "${DESTDIR}/$_jdk_home"/demo
}
4 changes: 4 additions & 0 deletions srcpkgs/openjdk23-bootstrap/update
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
site="https://github.com/openjdk/jdk23u/tags"
pattern='jdk-\K23\.[\d.+]+(?=\.)'
# don't need to update the bootstrap package
ignore="*"
97 changes: 97 additions & 0 deletions srcpkgs/openjdk24-bootstrap/template
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
# Template file for 'openjdk24-bootstrap'
pkgname=openjdk24-bootstrap
version=24.0.2+12
revision=1
_gtest_ver=1.14.0
_java_ver="${version%%.*}"
_jdk_update="${version#*+}"
_base_version="${version%+*}"
_jdk_home="usr/lib/jvm/openjdk${_java_ver}"
archs="x86_64* aarch64*"
build_style=gnu-configure
configure_args="--disable-warnings-as-errors
--enable-unlimited-crypto
--with-zlib=system
--with-libjpeg=system
--with-giflib=system
--with-libpng=system
--with-lcms=system
--with-jtreg=no
--with-gtest=./gtest
--with-debug-level=release
--with-native-debug-symbols=internal
--with-jobs=${XBPS_ORIG_MAKEJOBS}
--with-version-pre=
--with-version-build=${_jdk_update}
--with-version-opt=void-r${revision}
--with-vendor-name=Void
--with-vendor-url=https://voidlinux.org/
--with-vendor-bug-url=https://github.com/void-linux/void-packages/issues
--with-vendor-vm-bug-url=https://github.com/void-linux/void-packages/issues
--with-boot-jdk=/usr/lib/jvm/openjdk$(( _java_ver - 1 ))"
make_build_args="images"
make_check_target="test-hotspot-gtest"
hostmakedepends="pkg-config automake autoconf cpio tar unzip zip ca-certificates
openssl zlib-devel which openjdk$(( _java_ver - 1 ))-bootstrap"
makedepends="libXrender-devel libXtst-devel libXt-devel libXrandr-devel
giflib-devel libjpeg-turbo-devel cups-devel freetype-devel alsa-lib-devel
fontconfig-devel zlib-devel lcms2-devel"
short_desc="OpenJDK Java Development Kit (bootstrap version ${_java_ver})"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-2.0-only WITH Classpath-exception-2.0"
homepage="http://openjdk.java.net/"
distfiles="https://github.com/openjdk/jdk${_java_ver}u/archive/jdk-${version}.tar.gz
https://github.com/google/googletest/archive/refs/tags/v${_gtest_ver}.tar.gz"
checksum="947087e85c4222f25e1b9a707cea89b04c00a0a9eb79ded489f0bab92ea42beb
8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7"
nocross=yes
repository=bootstrap

skip_extraction="v${_gtest_ver}.tar.gz"

# Build and check are still parallel, but don't use -jN.
disable_parallel_build=yes
disable_parallel_check=yes

case "$XBPS_TARGET_MACHINE" in
i686*|arm*) broken="Unsupported architecture" ;;
esac

post_extract() {
mkdir -p gtest
vsrcextract -C gtest v${_gtest_ver}.tar.gz
chmod +x configure
}

do_configure() {
CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
CXXFLAGS=${CXXFLAGS/-D_FORTIFY_SOURCE=2/}

# force ELFv2 for ppc64 just in case
case "$XBPS_TARGET_MACHINE" in
ppc64*)
CFLAGS+=" -DABI_ELFv2"
CXXFLAGS+=" -DABI_ELFv2"
;;
esac

configure_args=${configure_args/--with-libtool-sysroot=$XBPS_CROSS_BASE}
if [ "$XBPS_CCACHE" ] && [ -z "$CROSS_BUILD" ]; then
configure_args+=" --enable-ccache"
CC="/usr/bin/cc"
CXX="/usr/bin/c++"
fi
./configure ${configure_args} \
--with-extra-cflags="$CFLAGS" \
--with-extra-cxxflags="$CXXFLAGS" \
--with-extra-ldflags="$LDFLAGS" \
READELF="$READELF" AR="$AR" STRIP="$STRIP" NM="$NM" \
OBJDUMP="$OBJDUMP" OBJCOPY="$OBJCOPY"
}

do_install() {
vmkdir $_jdk_home

vcopy "build/*-release/images/jdk/*" "${_jdk_home}"
rm -rf "${DESTDIR}/$_jdk_home"/lib/src.zip "${DESTDIR}/$_jdk_home"/demo
}
4 changes: 4 additions & 0 deletions srcpkgs/openjdk24-bootstrap/update
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
site="https://github.com/openjdk/jdk24u/tags"
pattern='jdk-\K24\.[\d.+]+(?=\.)'
# don't need to update the bootstrap package
ignore="*"
1 change: 1 addition & 0 deletions srcpkgs/openjdk25-doc
1 change: 1 addition & 0 deletions srcpkgs/openjdk25-jmods
1 change: 1 addition & 0 deletions srcpkgs/openjdk25-jre
1 change: 1 addition & 0 deletions srcpkgs/openjdk25-src
1 change: 1 addition & 0 deletions srcpkgs/openjdk25-static-libs
18 changes: 18 additions & 0 deletions srcpkgs/openjdk25/patches/system-public-suffix.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff --git a/src/java.base/share/classes/sun/security/util/DomainName.java.orig b/src/java.base/share/classes/sun/security/util/DomainName.java
index 4f577f1..116693c 100644
--- a/src/java.base/share/classes/sun/security/util/DomainName.java.orig
+++ b/src/java.base/share/classes/sun/security/util/DomainName.java
@@ -204,8 +204,11 @@ private static Rules createRules(String tld) {

private static InputStream getPubSuffixStream() {
InputStream is = null;
- File f = new File(System.getProperty("java.home"),
- "lib/security/public_suffix_list.dat");
+ File f = new File("/usr/share/publicsuffix/public_suffix_list.dat");
+ if (!f.exists()) {
+ f = new File(System.getProperty("java.home"),
+ "lib/security/public_suffix_list.dat");
+ }
try {
is = new FileInputStream(f);
} catch (FileNotFoundException e) { }
Loading