Clean up apt get installs in prerequisites.sh (#2384)

* move framework-specific installs from prerequesites into individual setup files

* some cleanup and fixed ruby and dlang requirements

* moved some fw_depends from setup scripts to framework or language install scripts

frameworks/C++/cpoll_cppsp/setup.sh

@@ -2,7 +2,7 @@
 
 sed -i 's|#define BENCHMARK_DB_HOST ".*"|#define BENCHMARK_DB_HOST "'"$DBHOST"'"|g' www/connectioninfo.H
 
-fw_depends cppsp
+fw_depends postgresql-server-dev-9.3 cppsp
 
 make clean
 make

frameworks/C++/silicon/setup_lwan_mysql.sh

@@ -1,5 +1,5 @@
 #! /bin/bash
-
+ 
 fw_depends silicon lwan
 
 rm -rf build

frameworks/Go/go-std/setup_mongo.sh

@@ -2,7 +2,7 @@
 
 sed -i 's|connectionString = "localhost"|connectionString = "'"${DBHOST}"'"|g' hello_mongo.go
 
-fw_depends go
+fw_depends go libsasl2-dev 
 
 go get gopkg.in/mgo.v2
 

frameworks/Ruby/ngx_mruby/setup.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm nginx
+fw_depends rvm nginx libhiredis-dev
 
 # We assume single-user installation as 
 # done in our rvm.sh script and 

toolset/setup/linux/bash_functions.sh

@@ -84,7 +84,6 @@ fw_traperror () {
 # Jester, etc. Users should be know this 
 # fairly well (e.g. you can't use Yaf without PHP)
 fw_depends() {
-
   # Turn on errtrace (-E), so that our ERR
   # trap is passed on to any subshells
   set -E
@@ -136,7 +135,8 @@ fw_depends() {
       set -x
       . $FWROOT/toolset/setup/linux/databases/${depend}.sh
     else
-      echo WARN: No installer found for $depend
+      echo WARN: No installer found for $depend, attempting to install with 'apt-get'...
+      sudo apt-get install -o Dpkg::Options::="--force-confold" --force-yes ${depend}
       # Return whence you came.
       popd
       continue

toolset/setup/linux/frameworks/lwan.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+fw_depends libjemalloc-dev libluajit-5.1-dev
+
 RETCODE=$(fw_exists ${IROOT}/lwan.installed)
 [ ! "$RETCODE" == 0 ] || { \
   source $IROOT/lwan.installed

toolset/setup/linux/frameworks/silicon.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends clang-3.8 gcc-4.9
+fw_depends libboost-dev clang-3.8 gcc-4.9
 
 RETCODE=$(fw_exists ${IROOT}/silicon.installed)
 [ ! "$RETCODE" == 0 ] || { \

toolset/setup/linux/languages/dlang.sh

@@ -1,10 +1,12 @@
 #!/bin/bash
 
+fw_depends xdg-utils
+
 RETCODE=$(fw_exists ${IROOT}/dlang.installed)
 [ ! "$RETCODE" == 0 ] || { \
   source $IROOT/dlang.installed
-  return 0; }
-  
+  return 0; }  
+
 DLANG=$IROOT/dlang
 DMDVER="2.071.1"
 LDCVER="1.0.0"

toolset/setup/linux/languages/ruby-2.0.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm
+fw_depends llvm-dev rvm
 
 RETCODE=$(fw_exists ${IROOT}/ruby-2.0.installed)
 [ ! "$RETCODE" == 0 ] || { \

toolset/setup/linux/languages/ruby-2.1.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm
+fw_depends llvm-dev rvm
 
 RETCODE=$(fw_exists ${IROOT}/ruby-2.1.installed)
 [ ! "$RETCODE" == 0 ] || { \

toolset/setup/linux/languages/ruby-2.2.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_depends rvm
+fw_depends llvm-dev rvm
 
 RETCODE=$(fw_exists ${IROOT}/ruby-2.2.installed)
 [ ! "$RETCODE" == 0 ] || { \

toolset/setup/linux/prerequisites.sh

@@ -46,14 +46,7 @@ sudo apt-get -qqy install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options:
   liborc-0.4-0 libwxbase2.8-0 libwxgtk2.8-0 libgnutls-dev \
   libjson0-dev libmcrypt-dev libicu-dev gettext \
   libpq-dev mlton \
-  libjemalloc-dev libluajit-5.1-dev `# Needed by lwan at least` \
-  libhiredis-dev                    `# Redis client - Needed by ngx_mruby at least` \
   cloc dstat                        `# Collect resource usage statistics` \
-  libsasl2-dev                      `# Needed by mgo for go-mongodb test` \
-  llvm-dev                          `# Required for correct Ruby installation` \
-  libboost-dev                      `# Silicon relies on boost::lexical_cast.` \
-  postgresql-server-dev-9.3         `# Needed by cpoll.` \
-  xdg-utils                         `# Needed by dlang.` \
   python-pip
 
 sudo pip install colorama==0.3.1