openjdk-17: Separate openjdk-17-x as a subpackage

still very experimental though.
This commit is contained in:
Tee KOBAYASHI 2022-11-09 00:39:31 +09:00 committed by xtkoba
parent d4f0faff66
commit d5ae1f527e
2 changed files with 20 additions and 5 deletions

View File

@ -3,12 +3,14 @@ TERMUX_PKG_DESCRIPTION="Java development kit and runtime"
TERMUX_PKG_LICENSE="GPL-2.0"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION=17.0
TERMUX_PKG_REVISION=24
TERMUX_PKG_REVISION=25
TERMUX_PKG_SRCURL=https://github.com/termux/openjdk-mobile-termux/archive/ec285598849a27f681ea6269342cf03cf382eb56.tar.gz
TERMUX_PKG_SHA256=d7c6ead9d80d0f60d98d0414e9dc87f5e18a304e420f5cd21f1aa3210c1a1528
TERMUX_PKG_DEPENDS="freetype, giflib, libandroid-shmem, libandroid-spawn, libiconv, zlib, xorgproto, libx11, libxcursor, libxext, cups, fontconfig, libjpeg-turbo, libpng, libxrender, libxtst, libxrandr, libxt, libxi"
TERMUX_PKG_BUILD_DEPENDS="cups, fontconfig, libpng, libx11, libxrender"
TERMUX_PKG_SUGGESTS="cups, fontconfig, libx11, libxrender"
TERMUX_PKG_DEPENDS="libiconv, libjpeg-turbo, zlib"
TERMUX_PKG_BUILD_DEPENDS="cups, libandroid-spawn, xorgproto"
# openjdk-17-x is recommended because X11 separation is still very experimental.
TERMUX_PKG_RECOMMENDS="openjdk-17-x"
TERMUX_PKG_SUGGESTS="cups"
TERMUX_PKG_BUILD_IN_SRC=true
TERMUX_PKG_HAS_DEBUG=false
@ -67,7 +69,7 @@ termux_step_configure() {
--openjdk-target=$TERMUX_HOST_PLATFORM \
--with-extra-cflags="$CFLAGS $CPPFLAGS -DLE_STANDALONE -DANDROID -D__TERMUX__=1" \
--with-extra-cxxflags="$CXXFLAGS $CPPFLAGS -DLE_STANDALONE -DANDROID -D__TERMUX__=1" \
--with-extra-ldflags="${jdk_ldflags} -landroid-shmem -landroid-spawn" \
--with-extra-ldflags="${jdk_ldflags} -Wl,--as-needed -landroid-shmem" \
--disable-precompiled-headers \
--disable-warnings-as-errors \
--enable-option-checking=fatal \

View File

@ -0,0 +1,13 @@
TERMUX_SUBPKG_INCLUDE="
opt/openjdk/include/jawt.h
opt/openjdk/include/linux/jawt_md.h
opt/openjdk/jmods/java.desktop.jmod
opt/openjdk/lib/libawt_xawt.so
opt/openjdk/lib/libfontmanager.so
opt/openjdk/lib/libjawt.so
opt/openjdk/lib/libsplashscreen.so
"
TERMUX_SUBPKG_DESCRIPTION="Portion of openjdk-17 requiring X11 functionality"
TERMUX_SUBPKG_DEPENDS="fontconfig, freetype, giflib, libandroid-shmem, libpng, libx11, libxext, libxi, libxrandr, libxrender, libxt, libxtst"
TERMUX_SUBPKG_BREAKS="openjdk-17 (<< 17.0-25)"
TERMUX_SUBPKG_REPLACES="openjdk-17 (<< 17.0-25)"