Jenkins: Move extra-cmake-modules to platform-independent dependencies
This commit is contained in:
@@ -590,7 +590,7 @@ else
|
|||||||
esac
|
esac
|
||||||
|
|
||||||
# Establish general dependencies.
|
# Establish general dependencies.
|
||||||
pkgs="cmake ninja-build pkg-config git wget p7zip-full wayland-protocols tar gzip file appstream"
|
pkgs="cmake ninja-build pkg-config git wget p7zip-full extra-cmake-modules wayland-protocols tar gzip file appstream"
|
||||||
if [ "$(dpkg --print-architecture)" = "$arch_deb" ]
|
if [ "$(dpkg --print-architecture)" = "$arch_deb" ]
|
||||||
then
|
then
|
||||||
pkgs="$pkgs build-essential"
|
pkgs="$pkgs build-essential"
|
||||||
@@ -608,7 +608,7 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Establish architecture-specific dependencies we don't want listed on the readme...
|
# Establish architecture-specific dependencies we don't want listed on the readme...
|
||||||
pkgs="$pkgs linux-libc-dev:$arch_deb extra-cmake-modules:$arch_deb qttools5-dev:$arch_deb qtbase5-private-dev:$arch_deb"
|
pkgs="$pkgs linux-libc-dev:$arch_deb qttools5-dev:$arch_deb qtbase5-private-dev:$arch_deb"
|
||||||
|
|
||||||
# ...and the ones we do want listed. Non-dev packages fill missing spots on the list.
|
# ...and the ones we do want listed. Non-dev packages fill missing spots on the list.
|
||||||
libpkgs=""
|
libpkgs=""
|
||||||
|
Reference in New Issue
Block a user