From 32ca3089828aa11459a6100bd4b6bb208ba31df6 Mon Sep 17 00:00:00 2001 From: King_DuckZ Date: Fri, 15 Jul 2016 19:26:42 +0100 Subject: [PATCH] Compile hiredis manually because the one from travis dates back to 2011 --- .travis.yml | 8 +++++++- lib/incredis | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 07ee63b..f41b794 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,6 @@ gcc_deps: &gcc_deps - libpq-dev - libpq5 - rpm - - libhiredis-dev - libev-dev sources: - ubuntu-toolchain-r-test @@ -80,6 +79,13 @@ install: (cd yaml-cpp && cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=on -DCMAKE_INSTALL_PREFIX=${DEPS_DIR}/opt . && cmake --build . && make install) fi + # Install hiredis + - | + if [ ! -f opt/lib/libhiredis.so ]; then + mkdir hiredis && travis_retry wget --quiet -O - https://github.com/redis/hiredis/archive/v0.13.3.tar.gz | tar --strip-components=1 -xz -C hiredis + (cd hiredis && make && cp libhiredis.so ${DEPS_DIR}/opt/lib) + fi + - cd ${TRAVIS_BUILD_DIR} cache: diff --git a/lib/incredis b/lib/incredis index afa4db7..0d4561e 160000 --- a/lib/incredis +++ b/lib/incredis @@ -1 +1 @@ -Subproject commit afa4db734846889068aa316b1cda8e11210cd241 +Subproject commit 0d4561e2c7c1a68124daa7ebf5b48ccb58c9f7fe