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
10 changes: 9 additions & 1 deletion packages/o/openjdk-21/abi_symbols
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,10 @@ libawt_xawt.so:Java_sun_awt_X11_XlibWrapper_memcpy
libawt_xawt.so:Java_sun_awt_screencast_ScreencastHelper_closeSession
libawt_xawt.so:Java_sun_awt_screencast_ScreencastHelper_getRGBPixelsImpl
libawt_xawt.so:Java_sun_awt_screencast_ScreencastHelper_loadPipewire
libawt_xawt.so:Java_sun_awt_screencast_ScreencastHelper_remoteDesktopKeyImpl
libawt_xawt.so:Java_sun_awt_screencast_ScreencastHelper_remoteDesktopMouseButtonImpl
libawt_xawt.so:Java_sun_awt_screencast_ScreencastHelper_remoteDesktopMouseMoveImpl
libawt_xawt.so:Java_sun_awt_screencast_ScreencastHelper_remoteDesktopMouseWheelImpl
libawt_xawt.so:Java_sun_font_FontConfigManager_getFontConfig
libawt_xawt.so:Java_sun_font_FontConfigManager_getFontConfigAASettings
libawt_xawt.so:Java_sun_font_FontConfigManager_getFontConfigVersion
Expand Down Expand Up @@ -873,7 +877,7 @@ libjava.so:JNU_ThrowNullPointerException
libjava.so:JNU_ThrowOutOfMemoryError
libjava.so:JNU_ToString
libjava.so:Java_java_io_Console_encoding
libjava.so:Java_java_io_Console_istty
libjava.so:Java_java_io_Console_ttyStatus
libjava.so:Java_java_io_FileCleanable_cleanupClose0
libjava.so:Java_java_io_FileDescriptor_close0
libjava.so:Java_java_io_FileDescriptor_getAppend
Expand Down Expand Up @@ -1053,6 +1057,7 @@ libjava.so:Java_jdk_internal_misc_VM_initialize
libjava.so:Java_jdk_internal_misc_VM_latestUserDefinedLoader0
libjava.so:Java_jdk_internal_platform_CgroupMetrics_getTotalMemorySize0
libjava.so:Java_jdk_internal_platform_CgroupMetrics_getTotalSwapSize0
libjava.so:Java_jdk_internal_platform_CgroupMetrics_isContainerized0
libjava.so:Java_jdk_internal_platform_CgroupMetrics_isUseContainerSupport
libjava.so:Java_jdk_internal_reflect_ConstantPool_getClassAt0
libjava.so:Java_jdk_internal_reflect_ConstantPool_getClassAtIfLoaded0
Expand Down Expand Up @@ -1340,6 +1345,7 @@ libjvm.so:JVM_InvokeMethod
libjvm.so:JVM_IsArrayClass
libjvm.so:JVM_IsCDSDumpingEnabled
libjvm.so:JVM_IsConstructorIx
libjvm.so:JVM_IsContainerized
libjvm.so:JVM_IsContinuationsSupported
libjvm.so:JVM_IsDumpingClassList
libjvm.so:JVM_IsFinalizationEnabled
Expand Down Expand Up @@ -1674,6 +1680,7 @@ libnio.so:Java_sun_nio_ch_NativeSocketAddress_sizeofSockAddr6
libnio.so:Java_sun_nio_ch_NativeThread_current0
libnio.so:Java_sun_nio_ch_NativeThread_init
libnio.so:Java_sun_nio_ch_NativeThread_signal0
libnio.so:Java_sun_nio_ch_NativeThread_supportPendingSignals0
libnio.so:Java_sun_nio_ch_Net_accept
libnio.so:Java_sun_nio_ch_Net_available
libnio.so:Java_sun_nio_ch_Net_bind0
Expand Down Expand Up @@ -1710,6 +1717,7 @@ libnio.so:Java_sun_nio_ch_Net_setIntOption0
libnio.so:Java_sun_nio_ch_Net_setInterface4
libnio.so:Java_sun_nio_ch_Net_setInterface6
libnio.so:Java_sun_nio_ch_Net_shouldSetBothIPv4AndIPv6Options0
libnio.so:Java_sun_nio_ch_Net_shouldShutdownWriteBeforeClose0
libnio.so:Java_sun_nio_ch_Net_shutdown
libnio.so:Java_sun_nio_ch_Net_socket0
libnio.so:Java_sun_nio_ch_PollSelectorImpl_poll
Expand Down
7 changes: 6 additions & 1 deletion packages/o/openjdk-21/abi_used_symbols
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ libX11.so.6:XDeleteProperty
libX11.so.6:XDestroyIC
libX11.so.6:XDestroyRegion
libX11.so.6:XDestroyWindow
libX11.so.6:XDisplayHeightMM
libX11.so.6:XDisplayKeycodes
libX11.so.6:XDisplayName
libX11.so.6:XDisplayString
Expand Down Expand Up @@ -360,6 +361,7 @@ libc.so.6:__getcwd_chk
libc.so.6:__getdelim
libc.so.6:__gethostname_chk
libc.so.6:__getpagesize
libc.so.6:__inet_pton_chk
libc.so.6:__isoc23_fscanf
libc.so.6:__isoc23_sscanf
libc.so.6:__isoc23_strtol
Expand Down Expand Up @@ -516,7 +518,6 @@ libc.so.6:iconv_close
libc.so.6:iconv_open
libc.so.6:if_nametoindex
libc.so.6:in6addr_any
libc.so.6:inet_pton
libc.so.6:inotify_add_watch
libc.so.6:inotify_init
libc.so.6:inotify_rm_watch
Expand Down Expand Up @@ -656,6 +657,7 @@ libc.so.6:socket
libc.so.6:socketpair
libc.so.6:stat
libc.so.6:stat64
libc.so.6:statfs64
libc.so.6:statvfs64
libc.so.6:stderr
libc.so.6:stdin
Expand Down Expand Up @@ -702,6 +704,7 @@ libc.so.6:vfork
libc.so.6:waitid
libc.so.6:waitpid
libc.so.6:wcsftime
libc.so.6:wcslen
libc.so.6:wcstombs
libc.so.6:write
libc.so.6:writev
Expand Down Expand Up @@ -830,6 +833,8 @@ libm.so.6:ceil
libm.so.6:ceilf
libm.so.6:cos
libm.so.6:exp
libm.so.6:fegetenv
libm.so.6:fesetenv
libm.so.6:floor
libm.so.6:floorf
libm.so.6:fma
Expand Down
44 changes: 16 additions & 28 deletions packages/o/openjdk-21/package.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# yaml-language-server: $schema=/usr/share/ypkg/schema/schema.json
name : openjdk-21
version : 21.0.6
release : 7
version : 21.0.11
release : 8
source :
- https://github.com/openjdk/jdk21u/archive/refs/tags/jdk-21.0.6-ga.tar.gz : 9fec30f33b3a85c982cf8c1a6d99d296b2eef4e627e8586c3e42b9692983f5e9
- https://github.com/openjdk/jdk21u/archive/refs/tags/jdk-21.0.11-ga.tar.gz : 76b8310966649ea8a6340f92d4f19f6f84e3083b682a514c8f1999c93373385f
# Detection seems broken, we can't use system gtest (TODO fix this)
- https://github.com/google/googletest/archive/refs/tags/v1.14.0.tar.gz : 8ad598c73ad796e0d8280b082cebd82a630d73e73cd3c70057938a6501bba5d7
license : GPL-2.0-only WITH Classpath-exception-2.0
Expand All @@ -18,6 +18,7 @@ builddeps :
- pkgconfig(cups)
- pkgconfig(fontconfig)
- pkgconfig(gtest)
- pkgconfig(harfbuzz)
- pkgconfig(lcms2)
- pkgconfig(libjpeg)
- pkgconfig(x11)
Expand Down Expand Up @@ -67,7 +68,7 @@ setup : |
--with-giflib=system \
--with-gtest=./gtest-local \
--with-harfbuzz=system \
--with-jtreg=/usr/share/jtreg7 \
--with-jtreg=/usr/share/jtreg8 \
--with-lcms=system \
--with-libjpeg=system \
--with-libpng=system \
Expand All @@ -88,35 +89,22 @@ build : |
# Build OpenJDK
make images test-image
install : |
install -Ddm00755 $installdir/%libdir%/
install -dm00755 $installdir/usr/include/openjdk-21/
install -dm00755 $installdir/usr/share/applications/

make install

# Binaries
mv $installdir/usr/jvm/openjdk-* $installdir/%libdir%/openjdk-21/
rm -rfv $installdir/usr/jvm/
rm -rfv $installdir/usr/bin/

# Remove license files and demo files
rm -rfv $installdir/%libdir%/openjdk-21/{legal,demo}/
install -Ddm00755 $installdir/%libdir%/openjdk-21/
cp -ra build/linux-x86_64-client-release/images/jdk/* $installdir/%libdir%/openjdk-21/

# Headers
pushd build/linux-x86_64-*/
cp -ar jdk/include/* $installdir/usr/include/openjdk-21/
# Symlink header files (because some apps look for them in $JAVA_HOME)
ln -srv $installdir/usr/include/openjdk-21/ $installdir/%libdir%/openjdk-21/include/
popd
install -dm00755 $installdir/usr/include/openjdk-21/
mv $installdir/%libdir%/openjdk-21/include/* $installdir/usr/include/openjdk-21/
ln -srvf $installdir/usr/include/openjdk-21/ $installdir/%libdir%/openjdk-21/include/

# Man pages
mv $installdir/%libdir%/openjdk-21/man/ $installdir/usr/share/
find $installdir/usr/share/man/ -type f -print -exec rename -- ".1" "-21.1" {} \;

# Add java-21-jar.desktop into usable apps
install -Dm 00644 $pkgfiles/java-21-jar.desktop $installdir/usr/share/applications/
if [ -d $installdir/%libdir%/openjdk-21/man ]; then
install -dm00755 $installdir/usr/share/
mv $installdir/%libdir%/openjdk-21/man/ $installdir/usr/share/
find $installdir/usr/share/man/ -type f -print -exec rename -- ".1" "-21.1" {} \;
fi

# Link system JVM installations under /usr/lib64/jvm so that tools that scan the system for JVMs can easily find them
# Link system JVM installations
install -dm00755 $installdir/%libdir%/jvm
ln -srv $installdir/%libdir%/openjdk-21 $installdir/%libdir%/jvm/openjdk-21
# Tests take a long time so should be disabled before pushing
Expand Down
Loading