summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2016-08-23 21:56:20 (GMT)
committerKevin Smith <kevin.smith@isode.com>2016-08-24 19:44:28 (GMT)
commit759ba1615226ad223b118533188ba55d8bc88ce0 (patch)
treef283fb891f9f04ea511bf4ca1689fb264e76598e
parent10672429a5ffc51eacfdd6d9c0563d0c1d17b01e (diff)
downloadswift-759ba1615226ad223b118533188ba55d8bc88ce0.zip
swift-759ba1615226ad223b118533188ba55d8bc88ce0.tar.bz2
Fixed to InstallSwiftDependencies.sh
Added ability to pass additional options to executed package management commands. Test-Information: Tested InstallSwiftDependencies.sh and successful compilation of Swift on Ubuntu 16.04, Ubuntu 15.04, Debian 8.5, OpenSUSE Leap 42.1 and Fedora 24. Change-Id: I36e14cfa6ce1a05edb29ea61cb713f66b0c95943
-rwxr-xr-xBuildTools/InstallSwiftDependencies.sh9
1 files changed, 5 insertions, 4 deletions
diff --git a/BuildTools/InstallSwiftDependencies.sh b/BuildTools/InstallSwiftDependencies.sh
index 4ace947..0522bbe 100755
--- a/BuildTools/InstallSwiftDependencies.sh
+++ b/BuildTools/InstallSwiftDependencies.sh
@@ -10,16 +10,17 @@ then
SYSTEM_DISTRO=$(lsb_release -i -s)
if [ "$SYSTEM_DISTRO" == "Debian" ]
then
- sudo apt-get install pkg-config libssl-dev qt5-default libqt5x11extras5-dev libqt5webkit5-dev qtmultimedia5-dev qttools5-dev-tools qt5-image-formats-plugins libqt5svg5-dev libminiupnpc-dev libnatpmp-dev libhunspell-dev
+ sudo apt-get install build-essential pkg-config libssl-dev qt5-default libqt5x11extras5-dev libqt5webkit5-dev qtmultimedia5-dev qttools5-dev-tools qt5-image-formats-plugins libqt5svg5-dev libminiupnpc-dev libnatpmp-dev libhunspell-dev
elif [ "$SYSTEM_DISTRO" == "Ubuntu" ]
then
- sudo apt-get install pkg-config libssl-dev qt5-default libqt5x11extras5-dev libqt5webkit5-dev qtmultimedia5-dev qttools5-dev-tools qt5-image-formats-plugins libqt5svg5-dev libminiupnpc-dev libnatpmp-dev libhunspell-dev
+ sudo apt-get install build-essential pkg-config libssl-dev qt5-default libqt5x11extras5-dev libqt5webkit5-dev qtmultimedia5-dev qttools5-dev-tools qt5-image-formats-plugins libqt5svg5-dev libminiupnpc-dev libnatpmp-dev libhunspell-dev
elif [ "$SYSTEM_DISTRO" == "Arch" ]
then
sudo pacman -S qt5-base qt5-x11extras qt5-webkit qt5-multimedia qt5-tools qt5-svg hunspell
- elif [ "$SYSTEM_DISTRO" == "openSUSE project" ]
+ elif [ "$SYSTEM_DISTRO" == "openSUSE project" ] || [ "$SYSTEM_DISTRO" == "SUSE LINUX" ]
then
- sudo zypper in pkg-config libopenssl-devel libQt5Core-devel libQt5WebKit5-devel libQt5WebKitWidgets-devel libqt5-qtmultimedia-devel libqt5-qtx11extras-devel libqt5-qttools-devel libQt5Gui-devel libQt5Network-devel libQt5DBus-devel libQt5Svg5 python-xml hunspell-devel
+ sudo zypper "$@" in --type pattern devel_basis
+ sudo zypper "$@" in pkg-config libopenssl-devel libQt5Core-devel libQt5WebKit5-devel libQt5WebKitWidgets-devel libqt5-qtmultimedia-devel libqt5-qtx11extras-devel libqt5-qttools-devel libQt5Gui-devel libQt5Network-devel libQt5DBus-devel libQt5Svg-devel libQt5Svg5 python-xml hunspell-devel
elif [ "$SYSTEM_DISTRO" == "Fedora" ]
then
sudo dnf groups install "C Development Tools and Libraries"