Updating install-build-deps.sh for Ubuntu 17.04 / 18.04 / LTS
Trivial fix for next LTS Ubuntu (similar to the https://chromium-review.googlesource.com/c/chromium/src/+/736729) + adding LTS info to older versions mentioned in changed sh file + removing 17.04 info Change-Id: Ib3889ac68bc41ff90cc6e36d9c60f56e2af76527 Reviewed-on: https://chromium-review.googlesource.com/1034055 Reviewed-by: Thomas Anderson <thomasanderson@chromium.org> Reviewed-by: Scott Graham <scottmg@chromium.org> Commit-Queue: Scott Graham <scottmg@chromium.org> Cr-Original-Commit-Position: refs/heads/master@{#554836} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: d7577c3d87fc74d4eb76b88f2fe2bd75163f3d4f
This commit is contained in:
Родитель
b585f5817f
Коммит
343b7396c7
|
@ -116,15 +116,16 @@ fi
|
|||
|
||||
distro_codename=$(lsb_release --codename --short)
|
||||
distro_id=$(lsb_release --id --short)
|
||||
supported_codenames="(trusty|xenial|zesty|artful)"
|
||||
supported_codenames="(trusty|xenial|artful|bionic)"
|
||||
supported_ids="(Debian)"
|
||||
if [ 0 -eq "${do_unsupported-0}" ] && [ 0 -eq "${do_quick_check-0}" ] ; then
|
||||
if [[ ! $distro_codename =~ $supported_codenames &&
|
||||
! $distro_id =~ $supported_ids ]]; then
|
||||
echo -e "ERROR: The only supported distros are\n" \
|
||||
"\tUbuntu 14.04 (trusty)\n" \
|
||||
"\tUbuntu 16.04 (xenial)\n" \
|
||||
"\tUbuntu 14.04 LTS (trusty)\n" \
|
||||
"\tUbuntu 16.04 LTS (xenial)\n" \
|
||||
"\tUbuntu 17.10 (artful)\n" \
|
||||
"\tUbuntu 18.04 LTS (bionic)\n" \
|
||||
"\tDebian 8 (jessie) or later" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
@ -168,7 +169,6 @@ dev_list="\
|
|||
libappindicator3-dev
|
||||
libasound2-dev
|
||||
libbrlapi-dev
|
||||
libav-tools
|
||||
libbz2-dev
|
||||
libcairo2-dev
|
||||
libcap-dev
|
||||
|
@ -422,7 +422,7 @@ case $distro_codename in
|
|||
arm_list+=" g++-4.8-multilib-arm-linux-gnueabihf
|
||||
gcc-4.8-multilib-arm-linux-gnueabihf"
|
||||
;;
|
||||
xenial|zesty|artful)
|
||||
xenial|artful|bionic)
|
||||
arm_list+=" g++-5-multilib-arm-linux-gnueabihf
|
||||
gcc-5-multilib-arm-linux-gnueabihf
|
||||
gcc-arm-linux-gnueabihf"
|
||||
|
@ -508,7 +508,12 @@ fi
|
|||
if package_exists xfonts-mathml; then
|
||||
dev_list="${dev_list} xfonts-mathml"
|
||||
fi
|
||||
if package_exists php7.1-cgi; then
|
||||
if package_exists libav-tools; then
|
||||
dev_list="${dev_list} libav-tools"
|
||||
fi
|
||||
if package_exists php7.2-cgi; then
|
||||
dev_list="${dev_list} php7.2-cgi libapache2-mod-php7.2"
|
||||
elif package_exists php7.1-cgi; then
|
||||
dev_list="${dev_list} php7.1-cgi libapache2-mod-php7.1"
|
||||
elif package_exists php7.0-cgi; then
|
||||
dev_list="${dev_list} php7.0-cgi libapache2-mod-php7.0"
|
||||
|
|
Загрузка…
Ссылка в новой задаче