diff --git a/Jenkinsfile b/Jenkinsfile index 174d186..5ac38f0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,7 +41,7 @@ pipeline { axes { axis { name 'COMP_OPTS'; - values 'OPT=0 LTO=OFF STATIC=OFF', 'OPT=2 LTO=OFF', 'PGO=ON' + values 'OPT=0 LTO=OFF STATIC=OFF', 'OPT=2 LTO=OFF', 'PGO=ON PACKAGE=ON' } } stages { @@ -62,7 +62,7 @@ pipeline { axis { name 'DISTRO'; values 'ubuntu', 'fedora', 'debian', 'archlinux' } axis { name 'COMP_OPTS'; - values 'OPT=0 LTO=OFF STATIC=OFF', 'OPT=2 LTO=OFF', 'PGO=ON' + values 'OPT=0 LTO=OFF STATIC=OFF', 'OPT=2 LTO=OFF', 'PGO=ON PACKAGE=ON' } } stages { diff --git a/lib/build.sh b/lib/build.sh index c2a15a6..392687f 100644 --- a/lib/build.sh +++ b/lib/build.sh @@ -1079,6 +1079,7 @@ build_libjxl() { recreate_dir "${INCDIR}/jxl" || return 1 meta_cmake_build \ + -DJPEGXL_ENABLE_JNI=OFF \ -DJPEGXL_FORCE_SYSTEM_BROTLI=ON \ -DJPEGXL_BUNDLE_LIBPNG=OFF || return 1 @@ -1089,8 +1090,6 @@ build_libjxl() { ) if [[ ${STATIC} == ON ]]; then libs+=(libjxl_extras_codec) - else - is_darwin || libs+=(libjxl_jni) fi sanitize_sysroot_libs "${libs[@]}" || return 1 }