install-build-deps: Check for newer packages first
Comment [1] explains that libssl1.0.0 can be manually installed on systems that
are expected to have libssl1.0.2. In this case, libssl1.0.0 will appear to be
available in the repos when it is not.
The fix is to check for newer packages first.
[1] https://bugs.chromium.org/p/chromium/issues/detail?id=785818#c13
BUG=785818
[email protected]
Change-Id: I52a69adc5271b5485f7d09aabd1a01a24ff10352
Reviewed-on: https://chromium-review.googlesource.com/819976
Commit-Queue: Dirk Pranke <[email protected]>
Reviewed-by: Dirk Pranke <[email protected]>
Cr-Commit-Position: refs/heads/master@{#523195}diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh
index 843e862..0082ca4 100755
--- a/build/install-build-deps.sh
+++ b/build/install-build-deps.sh
@@ -448,10 +448,12 @@
${naclports_list}
"
-if package_exists libssl1.0.0; then
- nacl_list="${nacl_list} libssl1.0.0:i386"
-else
+if package_exists libssl1.1; then
+ nacl_list="${nacl_list} libssl1.1:i386"
+elif package_exists libssl1.0.2; then
nacl_list="${nacl_list} libssl1.0.2:i386"
+else
+ nacl_list="${nacl_list} libssl1.0.0:i386"
fi
# Find the proper version of packages that depend on mesa. Only one -lts variant
@@ -479,10 +481,10 @@
nacl_list="${nacl_list} libgl1-mesa-glx${mesa_variant}:i386"
# Some package names have changed over time
-if package_exists libpng12-0; then
- lib_list="${lib_list} libpng12-0"
-else
+if package_exists libpng16-16; then
lib_list="${lib_list} libpng16-16"
+else
+ lib_list="${lib_list} libpng12-0"
fi
if package_exists libnspr4-dbg; then
dbg_list="${dbg_list} libnspr4-dbg libnss3-dbg"
@@ -508,10 +510,10 @@
else
dev_list="${dev_list} libbrlapi0.5"
fi
-if package_exists apache2-bin; then
- dev_list="${dev_list} apache2-bin"
-else
+if package_exists apache2.2-bin; then
dev_list="${dev_list} apache2.2-bin"
+else
+ dev_list="${dev_list} apache2-bin"
fi
if package_exists xfonts-mathml; then
dev_list="${dev_list} xfonts-mathml"
