Browse Source

Manually install the last version of microhttpd.

Matthieu Garrigues 10 years ago
parent
commit
3739e3ee71

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

@@ -6,6 +6,7 @@ include_directories($ENV{IROOT}/include
                     $ENV{HOME}/projects/silicon2
                     $ENV{HOME}/projects/iod)
 
+link_directories($ENV{IROOT}/lib)
 add_definitions(-std=c++14  -ftemplate-depth=512 -DNDEBUG -O3)
 
 add_executable(silicon_app main.cc)

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

@@ -1,10 +1,18 @@
 #!/bin/bash
 
+DIR=`pwd`
 rm -fr silicon;
 git clone https://github.com/matt-42/silicon.git
 cd silicon;
 CXX=/usr/bin/g++-4.9 ./install.sh $IROOT
 
+cd $DIR
+wget http://mirror.ibcp.fr/pub/gnu/libmicrohttpd/libmicrohttpd-0.9.39.tar.gz
+tar xvf libmicrohttpd-0.9.39.tar.gz
+cd libmicrohttpd-0.9.39
+./configure --prefix=$IROOT
+
+
 cd $TROOT
 mkdir -p build
 cd build; cmake .. -DCMAKE_CXX_COMPILER=g++-4.9 && make silicon_app

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

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