From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Fri, 8 Jul 2016 07:53:47 +0000 (+0200)
Subject: Build RPMs with protobuf
X-Git-Tag: rec-4.0.0~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e76d55511f7e73daa1c983495f6e5d3f739448d0;p=thirdparty%2Fpdns.git

Build RPMs with protobuf

Fixes #4130
---

diff --git a/build-scripts/build-dnsdist-rpm b/build-scripts/build-dnsdist-rpm
index 5b1d54c7ec..cf73f9bea7 100755
--- a/build-scripts/build-dnsdist-rpm
+++ b/build-scripts/build-dnsdist-rpm
@@ -44,6 +44,9 @@ INIT_INSTALL='sed -i "s,/^\(ExecStart.*\)dnsdist\(.*\)\$,\1dnsdist -u dnsdist -g
 INIT_FILES='/lib/systemd/system/dnsdist.service'
 INIT_CONFIGURE='--enable-systemd --with-systemd=/lib/systemd/system \'
 
+# CentOS 6 has protobuf, but not a modern enough boost. We defaul to with protobuf
+PROTOBUF_CONFIGURE='--with-protobuf \'
+
 # These two are the same for sysv and systemd (we don't install defaults files at the moment)
 DEFAULTS_INSTALL=''
 DEFAULTS_FILES=''
@@ -66,6 +69,7 @@ if [ -f /etc/redhat-release ]; then
       INIT_INSTALL='install -d -m 755 %{buildroot}/%{_initrddir} && install -m 755 contrib/dnsdist.init.centos6 %{buildroot}/%{_initrddir}/dnsdist'
       INIT_FILES='%{_initrddir}/dnsdist'
       INIT_CONFIGURE='\'
+      PROTOBUF_CONFIGURE='--without-protobuf \'
       SETUP="%setup -n %{name}-${TARBALLVERSION}"
       RPMBUILD_COMMAND="scl enable devtoolset-3 -- ${RPMBUILD_COMMAND}"
       ;;
@@ -106,8 +110,8 @@ ${SETUP}
 %build
 %configure \
   --sysconfdir=/etc/dnsdist \
-  --without-protobuf \
   ${INIT_CONFIGURE}
+  ${PROTOBUF_CONFIGURE}
   ${SODIUM_CONFIGURE}
 
 make