Merge pull request #2229 from matt-42/master

Fix clang installation and silicon tests, update LWAN.

frameworks/C++/silicon/CMakeLists.txt

@@ -16,4 +16,4 @@ set_target_properties(silicon_epoll_mysql PROPERTIES COMPILE_FLAGS "-DTFB_USE_EP
 target_link_libraries(silicon_epoll_mysql microhttpd mysqlclient)
 
 add_executable(silicon_lwan_mysql techempower_lwan.cc)
-target_link_libraries(silicon_lwan_mysql mysqlclient lwan-common curl z pthread dl)
+target_link_libraries(silicon_lwan_mysql mysqlclient lwan curl z pthread dl luajit-5.1)

frameworks/C++/silicon/setup_lwan_mysql.sh

@@ -5,7 +5,7 @@ fw_depends silicon lwan
 rm -rf build
 mkdir build
 cd build
-cmake .. -DCMAKE_CXX_COMPILER=clang++-3.5
+cmake .. -DCMAKE_CXX_COMPILER=clang++-3.8
 make silicon_lwan_mysql
 
 $TROOT/build/silicon_lwan_mysql ${DBHOST} 8080 &

frameworks/C++/silicon/setup_mhd_epoll_mysql.sh

@@ -5,7 +5,7 @@ fw_depends silicon microhttpd
 rm -rf build
 mkdir build
 cd build
-cmake .. -DCMAKE_CXX_COMPILER=clang++-3.5
+cmake .. -DCMAKE_CXX_COMPILER=clang++-3.8
 make silicon_epoll_mysql
 
 $TROOT/build/silicon_epoll_mysql ${DBHOST} 8080 ${MAX_THREADS} &

frameworks/C++/silicon/setup_mhd_tpc_mysql.sh

@@ -5,7 +5,7 @@ fw_depends silicon microhttpd
 rm -rf build
 mkdir build
 cd build
-cmake .. -DCMAKE_CXX_COMPILER=clang++-3.5
+cmake .. -DCMAKE_CXX_COMPILER=clang++-3.8
 make silicon_tpc_mysql
 
 $TROOT/build/silicon_tpc_mysql ${DBHOST} 8080 ${MAX_THREADS} &

toolset/setup/linux/frameworks/libreactor.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+fw_depends gcc-4.9
+
 RETCODE=$(fw_exists ${IROOT}/libreactor.installed)
 [ ! "$RETCODE" == 0 ] || { \
   # Load environment variables

toolset/setup/linux/frameworks/lwan.sh

@@ -5,7 +5,7 @@ RETCODE=$(fw_exists ${IROOT}/lwan.installed)
   source $IROOT/lwan.installed
   return 0; }
 
-REV='f1cd15c1a1bd15791c9f321fdc8c3ddb8d0e3799'
+REV='ff549b46548fefb2a1dd2a4c6a22c345fcfb3eeb'
 LWAN_HOME=$IROOT/lwan
 
 [ ! -e $IROOT/lwan.installed -a -d $LWAN_HOME ] && rm -rf $LWAN_HOME

toolset/setup/linux/frameworks/silicon.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+fw_depends clang-3.8 gcc-4.9
+
 RETCODE=$(fw_exists ${IROOT}/silicon.installed)
 [ ! "$RETCODE" == 0 ] || { \
   # Load environment variables
@@ -12,7 +14,7 @@ git clone https://github.com/matt-42/silicon.git
 cd silicon;
 # May 18th, 2016
 git checkout 73dac7f3c8dcd4f9c53713456e8b73165006e968
-CXX=clang++-3.5 ./install.sh $IROOT
+CC=clang-3.8 CXX=clang++-3.8 ./install.sh $IROOT
 
 echo "" > $IROOT/silicon.installed
 

toolset/setup/linux/frameworks/ulib.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+fw_depends gcc-4.9
+
 RETCODE=$(fw_exists ${IROOT}/ulib.installed)
 [ ! "$RETCODE" == 0 ] || { \
   source $IROOT/ulib.installed

toolset/setup/linux/prerequisites.sh

@@ -63,11 +63,6 @@ sudo pip install colorama==0.3.1
 sudo pip install progressbar==2.2
 sudo pip install requests
 
-# Install gcc-4.8, gcc-4.9 and clang
-sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-sudo apt-get -yq update
-sudo apt-get install -qqy gcc-4.8 g++-4.8 gcc-4.9 g++-4.9 clang-3.5
-
 # Stop permanently overwriting people's files just for 
 # trying out our software!
 RETCODE=$(fw_exists ~/.bash_profile.bak)

toolset/setup/linux/systools/clang-3.8.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+
+RETCODE=$(fw_exists ${IROOT}/clang-3.8.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  source $IROOT/clang-3.8.installed
+  return 0; }
+
+sudo add-apt-repository -s "deb http://apt.llvm.org/`lsb_release -cs`/ llvm-toolchain-`lsb_release -cs`-3.8 main"
+wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
+sudo apt-get -yq update
+sudo apt-get install -qqy clang-3.8
+
+touch $IROOT/clang-3.8.installed

toolset/setup/linux/systools/gcc-4.9.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+
+RETCODE=$(fw_exists ${IROOT}/gcc-4.9.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  source $IROOT/gcc-4.9.installed
+  return 0; }
+
+sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+sudo apt-get -yq update
+sudo apt-get install -qqy gcc-4.9 g++-4.9
+
+touch $IROOT/gcc-4.9.installed

toolset/setup/linux/systools/gcc-6.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+
+RETCODE=$(fw_exists ${IROOT}/gcc-6.installed)
+[ ! "$RETCODE" == 0 ] || { \
+  source $IROOT/gcc-6.installed
+  return 0; }
+
+sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+sudo apt-get -yq update
+sudo apt-get install -qqy gcc-6
+
+touch $IROOT/gcc-6.installed