mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-19 21:11:11 +08:00
coin: Explicitly provision the libzstd-dev package
It used to be installed as a dependency of some other package, but
stopped doing lately, which causes qtbase to build without zstd
support.
This change explicitly installs the libzstd-dev package to prevent
this from happening again.
Pick-to: 6.7
Fixes: QTBUG-124787
Fixes: QTBUG-127644
Change-Id: I72793ed96ef39ec07244079c51efe17ae1f9af66
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 8ad05756ed)
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
This commit is contained in:
@@ -171,6 +171,7 @@ installPackages+=(ssh)
|
||||
installPackages+=(diffstat)
|
||||
installPackages+=(binfmt-support)
|
||||
installPackages+=(zstd)
|
||||
installPackages+=(libzstd-dev)
|
||||
# Vulkan is needed for examples
|
||||
installPackages+=(libvulkan-dev)
|
||||
# Needed for qtdltlogging
|
||||
|
||||
@@ -27,6 +27,7 @@ installPackages+=(ninja-build)
|
||||
installPackages+=(pcre2-devel)
|
||||
installPackages+=(double-conversion-devel)
|
||||
installPackages+=(zstd)
|
||||
installPackages+=(libzstd-devel)
|
||||
# EGL support
|
||||
installPackages+=(mesa-libEGL-devel)
|
||||
installPackages+=(mesa-libGL-devel)
|
||||
|
||||
@@ -28,6 +28,7 @@ installPackages+=(ninja-build)
|
||||
installPackages+=(pcre2-devel)
|
||||
installPackages+=(double-conversion-devel)
|
||||
installPackages+=(zstd)
|
||||
installPackages+=(libzstd-devel)
|
||||
# EGL support
|
||||
installPackages+=(mesa-libEGL-devel)
|
||||
installPackages+=(mesa-libGL-devel)
|
||||
|
||||
@@ -29,6 +29,7 @@ installPackages+=(ninja-build)
|
||||
installPackages+=(pcre2-devel)
|
||||
installPackages+=(double-conversion-devel)
|
||||
installPackages+=(zstd)
|
||||
installPackages+=(libzstd-devel)
|
||||
# update kernel
|
||||
installPackages+=(kernel)
|
||||
installPackages+=(kernel-tools)
|
||||
|
||||
@@ -29,6 +29,7 @@ installPackages+=(ninja-build)
|
||||
installPackages+=(pcre2-devel)
|
||||
installPackages+=(double-conversion-devel)
|
||||
installPackages+=(zstd)
|
||||
installPackages+=(libzstd-devel)
|
||||
# update kernel
|
||||
installPackages+=(kernel)
|
||||
installPackages+=(kernel-tools)
|
||||
|
||||
@@ -29,6 +29,7 @@ installPackages+=(ninja-build)
|
||||
installPackages+=(pcre2-devel)
|
||||
installPackages+=(double-conversion-devel)
|
||||
installPackages+=(zstd)
|
||||
installPackages+=(libzstd-devel)
|
||||
# EGL support
|
||||
# mesa-libEGL-devel need to use older version than 22.1.5-2.el9 which cause Xorg to crash
|
||||
installPackages+=(mesa-libEGL-devel-21.3.4-2.el9)
|
||||
|
||||
@@ -29,6 +29,7 @@ installPackages+=(ninja-build)
|
||||
installPackages+=(pcre2-devel)
|
||||
installPackages+=(double-conversion-devel)
|
||||
installPackages+=(zstd)
|
||||
installPackages+=(libzstd-devel)
|
||||
# EGL support
|
||||
# mesa-libEGL-devel need to use older version than 22.1.5-2.el9 which cause Xorg to crash
|
||||
#installPackages+=(mesa-libEGL-devel-21.3.4-2.el9)
|
||||
|
||||
@@ -199,6 +199,7 @@ installPackages+=(ssh)
|
||||
installPackages+=(diffstat)
|
||||
installPackages+=(binfmt-support)
|
||||
installPackages+=(zstd)
|
||||
installPackages+=(libzstd-dev)
|
||||
# Vulkan is needed for examples
|
||||
installPackages+=(libvulkan-dev)
|
||||
# Needed for qtdltlogging
|
||||
|
||||
@@ -205,6 +205,7 @@ installPackages+=(ssh)
|
||||
installPackages+=(diffstat)
|
||||
installPackages+=(binfmt-support)
|
||||
installPackages+=(zstd)
|
||||
installPackages+=(libzstd-dev)
|
||||
installPackages+=(lz4)
|
||||
# Vulkan is needed for examples
|
||||
installPackages+=(libvulkan-dev)
|
||||
|
||||
@@ -207,6 +207,7 @@ installPackages+=(ssh)
|
||||
installPackages+=(diffstat)
|
||||
installPackages+=(binfmt-support)
|
||||
installPackages+=(zstd)
|
||||
installPackages+=(libzstd-dev)
|
||||
installPackages+=(lz4)
|
||||
# Vulkan is needed for examples
|
||||
installPackages+=(libvulkan-dev)
|
||||
|
||||
Reference in New Issue
Block a user