Skip to content
Snippets Groups Projects
Commit ddfd5a0f authored by AlQuemist's avatar AlQuemist
Browse files

Linux-CI: add extra dependencies (libdeflate, libwebp and libLerc) for libtiff

parent 3fff6fd4
No related branches found
No related tags found
2 merge requests!1525Updates from r20.0,!1520Fixes to CI scripts
Hide whitespace changes
Inline Side-by-side
devtools/deploy/linux/adjust_pkg_linux.sh.in
+ 1
− 1
View file @ ddfd5a0f
...@@ -57,7 +57,7 @@ echo "$TITLE: package root = '$pkg_root_dir', " \ ...@@ -57,7 +57,7 @@ echo "$TITLE: package root = '$pkg_root_dir', " \
# libraries allowed to be included in the package # libraries allowed to be included in the package
libs_inc_re='cerf|formfactor|gsl|fftw|boost|tiff|jpeg|jbig|Qt' libs_inc_re='cerf|formfactor|gsl|fftw|boost|tiff|jpeg|jbig|Qt'
# compression libraries # compression libraries
libs_inc_re=${libs_inc_re}'|zstd|lzma|deflate|bz2' libs_inc_re=${libs_inc_re}'|zstd|lzma|deflate|bz2|Lerc'
# secondary dependencies # secondary dependencies
# X11 interface (libQt5XcbQpa): # X11 interface (libQt5XcbQpa):
libs_inc_re=${libs_inc_re}'|XcbQpa|xcb-xinerama|xcb-xinput' libs_inc_re=${libs_inc_re}'|XcbQpa|xcb-xinerama|xcb-xinput'
......
devtools/deploy/linux/mk_pypack_linux.sh.in
+ 1
− 1
View file @ ddfd5a0f
...@@ -48,7 +48,7 @@ fi ...@@ -48,7 +48,7 @@ fi
echo "$TITLE: library directories = '$libdir', '$xlibdir'" echo "$TITLE: library directories = '$libdir', '$xlibdir'"
# libraries allowed to be included in the package # libraries allowed to be included in the package
libs_inc_re='cerf|formfactor|gsl|fftw|boost|zstd|lzma|bz2|tiff|jpeg|jbig' libs_inc_re='cerf|formfactor|gsl|fftw|boost|zstd|lzma|bz2|tiff|jpeg|jbig|deflate|webp|Lerc'
# extract dependency names and locations from the raw output of `ldd` # extract dependency names and locations from the raw output of `ldd`
# NOTE: ldd returns all dependencies recursively. # NOTE: ldd returns all dependencies recursively.
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment