Browse Source

move prereqs to proper place

Keenan Brock 10 years ago
parent
commit
da40596641
2 changed files with 2 additions and 2 deletions
  1. 1 2
      frameworks/Ruby/ngx_mruby/install.sh
  2. 1 0
      toolset/setup/linux/prerequisites.sh

+ 1 - 2
frameworks/Ruby/ngx_mruby/install.sh

@@ -5,7 +5,6 @@ PREFIX=${IROOT}/nginx_mruby
 RETCODE=$(fw_exists ${IROOT}/nginx_mruby.installed)
 RETCODE=$(fw_exists ${IROOT}/nginx_mruby.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
 
-sudo apt-get install -y libhiredis-dev
 fw_depends rvm
 fw_depends rvm
 rvm install ruby-2.0.0-p0
 rvm install ruby-2.0.0-p0
 rvm use ruby-2.0.0-p0
 rvm use ruby-2.0.0-p0
@@ -15,6 +14,6 @@ git submodule init
 git submodule update
 git submodule update
 
 
 NGINX_CONFIG_OPT_ENV="--prefix=${PREFIX} --with-http_stub_status_module" sh build.sh
 NGINX_CONFIG_OPT_ENV="--prefix=${PREFIX} --with-http_stub_status_module" sh build.sh
-sudo make install
+make install
 
 
 touch ${IROOT}/nginx_mruby.installed
 touch ${IROOT}/nginx_mruby.installed

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

@@ -41,6 +41,7 @@ sudo apt-get -yq install -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::
   libjson0-dev libmcrypt-dev libicu-dev gettext \
   libjson0-dev libmcrypt-dev libicu-dev gettext \
   libpq-dev mlton \
   libpq-dev mlton \
   libjemalloc-dev                   `# Needed by lwan at least` \
   libjemalloc-dev                   `# Needed by lwan at least` \
+  libhiredis-dev                    `# used for compiling ngx_mruby`
   cloc dstat                        `# Collect resource usage statistics`
   cloc dstat                        `# Collect resource usage statistics`
 
 
 # Install gcc-4.8
 # Install gcc-4.8