Changeset 73341 in vbox for trunk/tools/bin

Timestamp:

Jul 24, 2018 8:12:22 AM (6 years ago)

Author:

vboxsync

Message:

tools/bin/prerequisites-deb.sh: revert r123793.
bugref:9165: webtools: create scripts for (re-)creating chroot build jails
It turns out that Debian and Ubuntu always install the right version of
libcurl3/4-openssl, regardless of which one we ask for, so just ask for
version 4 and be done with it.

File:

• trunk/tools/bin/prerequisites-deb.sh (modified) (1 diff)

trunk/tools/bin/prerequisites-deb.sh

@@ -60 +60 @@
 # distributions, but at the end everything needed should be there.
 apt-get install -y chrpath g++ make iasl libidl-dev libsdl1.2-dev \
-    libsdl-ttf2.0-dev libpam0g-dev libssl-dev libpulse-dev libasound2-dev \
-    xsltproc libxml2-dev libxml2-utils unzip libxrandr-dev libxinerama-dev \
-    libcap-dev python-dev libxmu-dev libxcursor-dev libdevmapper-dev \
+    libsdl-ttf2.0-dev libpam0g-dev libssl-dev libpulse-dev \
+    libasound2-dev xsltproc libxml2-dev libxml2-utils unzip \
+    libxrandr-dev libxinerama-dev libcap-dev python-dev \
+    libxmu-dev libxcursor-dev libcurl4-openssl-dev libdevmapper-dev \
     libvpx-dev g++-multilib libopus-dev || true
 # Only install Qt5 on recent distributions
 case "${DEBVER}" in
 7*|8*|jessie*|stretch*) ;;
-    apt-get install -y libcurl3-openssl-dev || true
 *)
     apt-get install -y qttools5-dev-tools libqt5opengl5-dev \
-        libqt5x11extras5-dev libcurl4-openssl-dev || true ;;
+        libqt5x11extras5-dev || true ;;
 esac
 test -n "${WITHDOCS}" &&