Browse Source

Update LWAN to its lastest version and fix the test silicon-lwan.

Matthieu Garrigues 9 years ago
parent
commit
f5e7dfff6b
2 changed files with 3 additions and 2 deletions
  1. 2 1
      frameworks/C++/silicon/CMakeLists.txt
  2. 1 1
      toolset/setup/linux/frameworks/lwan.sh

+ 2 - 1
frameworks/C++/silicon/CMakeLists.txt

@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 2.8)
 
 
 project(silicon)
 project(silicon)
 
 
+
 include_directories($ENV{IROOT}/include $ENV{MICROHTTPD_HOME}/include)
 include_directories($ENV{IROOT}/include $ENV{MICROHTTPD_HOME}/include)
 
 
 link_directories($ENV{IROOT}/lib $ENV{MICROHTTPD_HOME}/lib)
 link_directories($ENV{IROOT}/lib $ENV{MICROHTTPD_HOME}/lib)
@@ -16,4 +17,4 @@ set_target_properties(silicon_epoll_mysql PROPERTIES COMPILE_FLAGS "-DTFB_USE_EP
 target_link_libraries(silicon_epoll_mysql microhttpd mysqlclient)
 target_link_libraries(silicon_epoll_mysql microhttpd mysqlclient)
 
 
 add_executable(silicon_lwan_mysql techempower_lwan.cc)
 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)

+ 1 - 1
toolset/setup/linux/frameworks/lwan.sh

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