From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Wed, 24 Jul 2019 13:40:42 +0000 (+0200)
Subject: dnsdist: Build with CDB and LMDB support in Travis and CircleCI
X-Git-Tag: dnsdist-1.4.0-rc2~9^2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=60fb9966d1e0ee8d9445ce19556ac35564858530;p=pdns

dnsdist: Build with CDB and LMDB support in Travis and CircleCI
---

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4a3079b6e..8ea8e4512 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -183,14 +183,16 @@ commands:
               libluajit-5.1 \
               libboost-all-dev \
               libcap2 \
+              libcdb1 \
               libcurl4-openssl-dev \
               libfstrm0 \
               libh2o-evloop0.13 \
+              liblmdb0 \
+              libprotobuf17 \
               libre2-5 \
               libssl-dev \
               libsystemd0 \
               libsodium23 \
-              libprotobuf17 \
               protobuf-compiler \
               virtualenv
 
@@ -1028,8 +1030,10 @@ jobs:
             git \
             libboost-all-dev \
             libcap-dev \
+            libcdb-dev \
             libedit-dev \
             libfstrm-dev \
+            liblmdb-dev \
             libluajit-5.1-dev \
             libprotobuf-dev \
             libre2-dev \
@@ -1172,9 +1176,11 @@ jobs:
             git \
             libboost-all-dev \
             libcap-dev \
+            libcdb-dev \
             libedit-dev \
             libfstrm-dev \
             libh2o-evloop-dev \
+            liblmdb-dev \
             libluajit-5.1-dev \
             libprotobuf-dev \
             libre2-dev \
diff --git a/build-scripts/travis.sh b/build-scripts/travis.sh
index d4275eb59..a3e224474 100755
--- a/build-scripts/travis.sh
+++ b/build-scripts/travis.sh
@@ -373,8 +373,10 @@ install_dnsdist() {
   run "sudo apt-get -qq update"
   run "sudo apt-get -qq --no-install-recommends install \
     snmpd \
-    libsnmp-dev \
-    libfstrm-dev"
+    libcdb-dev \
+    libfstrm-dev \
+    liblmdb-dev \
+    libsnmp-dev"
   run "sudo sed -i \"s/agentxperms 0700 0755 dnsdist/agentxperms 0700 0755 ${USER}/g\" regression-tests.dnsdist/snmpd.conf"
   run "sudo cp -f regression-tests.dnsdist/snmpd.conf /etc/snmp/snmpd.conf"
   run "sudo service snmpd restart"
@@ -464,6 +466,7 @@ build_dnsdist(){
     --enable-dnscrypt \
     --enable-dns-over-tls \
     --enable-dnstap \
+    --with-lmdb=/usr \
     --prefix=$HOME/dnsdist \
     --disable-silent-rules"
   run "make -k -j3"