mirror of
https://github.com/InstanceBrick/nightcap.git
synced 2026-10-20 16:00:34 +02:00
Fix AnyLinux JRE dependency closure
This commit is contained in:
1 parent
9812fbceab
commit
409d8a6319
2 files changed
+18
No files matched your search
@@ -555,6 +555,22 @@ BuildJlinkRuntime() {
|
||||
--strip-debug --no-man-pages \
|
||||
--no-header-files --compress="${compression}" \
|
||||
--output "${SUPPORT_RUNTIME}/jre"
|
||||
|
||||
# apkanalyzer needs java.desktop data structures, but neither it nor
|
||||
# apksigner uses Java Sound. Some OpenJDK builds link this optional native
|
||||
# library against ALSA, which is intentionally absent from the AnyLinux
|
||||
# build image and must not become a standalone runtime dependency.
|
||||
local java_sound_library
|
||||
for java_sound_library in \
|
||||
"${SUPPORT_RUNTIME}/jre/lib/libjsound.so" \
|
||||
"${SUPPORT_RUNTIME}/jre/lib/libjsoundalsa.so"; do
|
||||
if [[ -e "${java_sound_library}" || -L "${java_sound_library}" ]]; then
|
||||
[[ ! -d "${java_sound_library}" ]] ||
|
||||
Die "Java Sound library path is unexpectedly a directory"
|
||||
rm -f -- "${java_sound_library}"
|
||||
fi
|
||||
done
|
||||
|
||||
[[ -x "${SUPPORT_RUNTIME}/jre/bin/java" ]] ||
|
||||
Die "jlink did not produce a Java launcher"
|
||||
ln -s -- "../jre/bin/java" "${SUPPORT_RUNTIME}/bin/java"
|
||||
|
||||
@@ -419,6 +419,8 @@ PYTHONNOUSERSITE=1 "${standalone_runtime}/runtime/bin/python3" -s -c \
|
||||
! find "${standalone_runtime}/runtime/python" \
|
||||
\( -type d \( -name tkinter -o -name idlelib -o -name turtledemo \) -o \
|
||||
-type f -name '_tkinter*.so' \) -print -quit | grep -q .
|
||||
! find "${standalone_runtime}/runtime/jre" -name 'libjsound*.so' \
|
||||
-print -quit | grep -q .
|
||||
[[ -s "${standalone_runtime}/webkit.env" ]]
|
||||
[[ ! -e "${standalone_runtime}/scripts/mocktail_login_webview.py" ]]
|
||||
[[ ! -e "${standalone_runtime}/libexec/webkit2gtk-4.1" ]]
|
||||
|
||||
Reference in new issue
Block a user