Merge pull request #1529 from bluca/container

Container-based CI build

.travis.yml

@@ -10,6 +10,8 @@ env:
 - BUILD_TYPE=default
 - BUILD_TYPE=qt-android
 
+sudo: false
+
 before_script:
 # ZMQ stress tests need more open socket (files) than the usual default
 # On OSX, it seems the way to set the max files limit is constantly changing, so

ci_build.sh

@@ -1,15 +1,27 @@
 #!/usr/bin/env bash
 
+set -x
+
 if [ $BUILD_TYPE == "default" ]; then
+    mkdir tmp
+    BUILD_PREFIX=$PWD/tmp
+
+    CONFIG_OPTS=()
+    CONFIG_OPTS+=("CFLAGS=-I${BUILD_PREFIX}/include")
+    CONFIG_OPTS+=("CPPFLAGS=-I${BUILD_PREFIX}/include")
+    CONFIG_OPTS+=("CXXFLAGS=-I${BUILD_PREFIX}/include")
+    CONFIG_OPTS+=("LDFLAGS=-L${BUILD_PREFIX}/lib")
+    CONFIG_OPTS+=("PKG_CONFIG_PATH=${BUILD_PREFIX}/lib/pkgconfig")
+    CONFIG_OPTS+=("--prefix=${BUILD_PREFIX}")
+
     #   Build required projects first
 
     #   libsodium
     git clone git://github.com/jedisct1/libsodium.git
-    ( cd libsodium; ./autogen.sh; ./configure; make check; sudo make install;
-        if [ $TRAVIS_OS_NAME != "osx" ] ; then sudo ldconfig ; fi )
+    ( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make check; make install)
 
     #   Build and check this project
-    (./autogen.sh && ./configure --with-libsodium=yes && make && make check && sudo make install) || exit 1
+    (./autogen.sh && ./configure "${CONFIG_OPTS[@]}" --with-libsodium=yes && make && make check && make install) || exit 1
 else
     cd ./builds/${BUILD_TYPE} && ./ci_build.sh
 fi