瀏覽代碼

Move installation of microhttpd and boost in prerequities.sh.

Matthieu Garrigues 10 年之前
父節點
當前提交
41817a8449
共有 2 個文件被更改,包括 2 次插入3 次删除
  1. 0 2
      frameworks/C++/silicon/install.sh
  2. 2 1
      toolset/setup/linux/prerequisites.sh

+ 0 - 2
frameworks/C++/silicon/install.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 #!/bin/bash
 
 
-sudo apt-get install -yq libmicrohttpd-dev libboost-dev
-
 rm -fr silicon;
 rm -fr silicon;
 git clone https://github.com/matt-42/silicon.git
 git clone https://github.com/matt-42/silicon.git
 cd silicon;
 cd silicon;

+ 2 - 1
toolset/setup/linux/prerequisites.sh

@@ -42,7 +42,8 @@ sudo apt-get -qqy install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options:
   libpq-dev mlton \
   libpq-dev mlton \
   libjemalloc-dev libluajit-5.1-dev `# Needed by lwan at least` \
   libjemalloc-dev libluajit-5.1-dev `# Needed by lwan at least` \
   libhiredis-dev                    `# Redis client - Needed by ngx_mruby at least` \
   libhiredis-dev                    `# Redis client - Needed by ngx_mruby at least` \
-  cloc dstat                        `# Collect resource usage statistics`
+  cloc dstat                        `# Collect resource usage statistics` \
+  libmicrohttpd-dev libboost-dev
 
 
 # Install gcc-4.8 and gcc-4.9
 # Install gcc-4.8 and gcc-4.9
 sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
 sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y