Merge pull request #1264 from TechEmpower/fixLwan

Fixed Lwan

frameworks/C/lwan/bash_profile.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-export LWAN_ROOT=${IROOT}/lwan
-export LWAN_BUILD=${LWAN_ROOT}/build

frameworks/C/lwan/install.sh

@@ -9,13 +9,12 @@ RETCODE=$(fw_exists ${INSTALLED_FILE})
 [ ! -e ${INSTALLED_FILE} -a -d ${IROOT}/lwan ] && rm -rf ${IROOT}/lwan
 
 # Lwan is only built during installation as a dependency sanity check.
-sudo apt-get update && \
-	sudo apt-get install -qqy libjemalloc-dev libmysqlclient-dev libsqlite3-dev && \
-	git clone git://github.com/lpereira/lwan.git && \
-        cd lwan && \
-        git checkout ${REV} && \
-        mkdir build && \
-        cd build && \
-        cmake .. -DCMAKE_BUILD_TYPE=Release && \
-        make techempower && \
-        touch ${INSTALLED_FILE}
+git clone git://github.com/lpereira/lwan.git
+cd lwan
+git checkout ${REV}
+mkdir build
+cd build
+cmake .. -DCMAKE_BUILD_TYPE=Release
+make techempower
+
+touch ${INSTALLED_FILE}

frameworks/C/lwan/setup-mysql.sh

@@ -6,5 +6,12 @@ export MYSQL_PASS=benchmarkdbpass
 export MYSQL_HOST=$DBHOST
 export MYSQL_DB=hello_world
 
+export LWAN_ROOT=${IROOT}/lwan
+export LWAN_BUILD=${LWAN_ROOT}/build
+
+rm -rf ${LWAN_BUILD}
+mkdir -p ${LWAN_BUILD}
+cd ${LWAN_BUILD}
+cmake ${LWAN_ROOT} -DCMAKE_BUILD_TYPE=Release && make techempower
 cd $LWAN_ROOT/techempower
-$LWAN_BUILD/techempower/techempower &
+$LWAN_BUILD/techempower/techempower &

frameworks/C/lwan/setup.sh

@@ -1,4 +1,11 @@
 #!/bin/bash
 
+export LWAN_ROOT=${IROOT}/lwan
+export LWAN_BUILD=${LWAN_ROOT}/build
+
+rm -rf ${LWAN_BUILD}
+mkdir -p ${LWAN_BUILD}
+cd ${LWAN_BUILD}
+cmake ${LWAN_ROOT} -DCMAKE_BUILD_TYPE=Release && make techempower
 cd $LWAN_ROOT/techempower
-$LWAN_BUILD/techempower/techempower &
+$LWAN_BUILD/techempower/techempower &

toolset/setup/linux/prerequisites.sh

@@ -40,6 +40,7 @@ sudo apt-get -yq 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                   `# Needed by lwan at least` \
   cloc dstat                        `# Collect resource usage statistics`
 
 # Install gcc-4.8