Disable protobuf detection in packages

So that we do not accidently link against it.

diff --git a/build-scripts/build-auth-rpm b/build-scripts/build-auth-rpm
index c8b73998af20b013267bcbc4cdfbd80ec71cd56d..cc79459be5d3ccf5d878877812cac92db5b91944 100755 (executable)
--- a/build-scripts/build-auth-rpm
+++ b/build-scripts/build-auth-rpm
@@ -171,6 +171,7 @@ export CPPFLAGS="-DLDAP_DEPRECATED"
        --with-lua \
        --with-dynmodules='%{backends} random' \
        --enable-tools \
+       --without-protobuf \
        --enable-remotebackend-http \
        --enable-unit-tests
 
@@ -438,6 +439,7 @@ export CPPFLAGS="-DLDAP_DEPRECATED"
        --with-lua \
        --with-dynmodules='%{backends} random' \
        --enable-tools \
+       --without-protobuf \
        --enable-unit-tests \
        --enable-systemd
 
@@ -693,6 +695,7 @@ export CPPFLAGS="-DLDAP_DEPRECATED"
        --with-lua \
        --with-dynmodules='%{backends} random' \
        --enable-tools \
+       --without-protobuf \
        --enable-unit-tests \
        --enable-systemd
 

diff --git a/build-scripts/build-dnsdist-rpm b/build-scripts/build-dnsdist-rpm
index 71b87577bcb6de233e12fd73ffd1890ab85c23f4..9f0e0dd8d45c5bf7fd74c739979fdf8ebccbe22b 100755 (executable)
--- a/build-scripts/build-dnsdist-rpm
+++ b/build-scripts/build-dnsdist-rpm
@@ -104,6 +104,7 @@ ${SETUP}
 %build
 %configure \
   --sysconfdir=/etc/dnsdist \
+  --without-protobuf \
   ${INIT_CONFIGURE}
   ${SODIUM_CONFIGURE}
 

diff --git a/build-scripts/build-recursor-rpm b/build-scripts/build-recursor-rpm
index 1c5882d65f21864c5f8c015bb7bf0d9a1e1a2a2b..1f99a6b2c476d9ca32424099755de284372480d0 100755 (executable)
--- a/build-scripts/build-recursor-rpm
+++ b/build-scripts/build-recursor-rpm
@@ -142,6 +142,7 @@ package if you need a dns cache for your network.
        --disable-static \
        --disable-dependency-tracking \
        --disable-silent-rules \
+       --without-protobuf \
        --enable-unit-tests
 
 make %{?_smp_mflags}
@@ -233,6 +234,7 @@ package if you need a dns cache for your network.
        --disable-dependency-tracking \
        --disable-silent-rules \
        --enable-unit-tests \
+       --without-protobuf \
        --enable-systemd
 
 make %{?_smp_mflags}

diff --git a/build-scripts/debian-authoritative/rules b/build-scripts/debian-authoritative/rules
index 808ed45a3a999b284686a9a3f9deceb092fb6fe0..42348d2b458e000a78201b75329d113792cd47ae 100755 (executable)
--- a/build-scripts/debian-authoritative/rules
+++ b/build-scripts/debian-authoritative/rules
@@ -49,6 +49,7 @@ override_dh_auto_configure:
                --with-pgsql-includes=`pg_config --includedir` \
                --enable-botan1.10 \
                --enable-tools \
+               --without-protobuf \
                --enable-unit-tests \
                $(ENABLE_SYSTEMD)
 

diff --git a/build-scripts/debian-dnsdist/rules b/build-scripts/debian-dnsdist/rules
index 7bfaa48207423bbcb7fddb67d866169f5ad12888..f0fafa0792f71cec05f7e2a33eb0ca50dfc8b501 100755 (executable)
--- a/build-scripts/debian-dnsdist/rules
+++ b/build-scripts/debian-dnsdist/rules
@@ -46,6 +46,7 @@ override_dh_auto_configure:
          --infodir=\$${prefix}/share/info \
          --libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)' \
          --libexecdir='$${prefix}/lib' \
+         --without-protobuf \
          $(ENABLE_SYSTEMD) \
          $(ENABLE_LIBSODIUM)
 

diff --git a/build-scripts/debian-recursor/rules b/build-scripts/debian-recursor/rules
index 7e16cff734e9ef56f880e5a9f87169ab37602eb4..a82f4290b960e35bfad0a11425a84378b0394d08 100755 (executable)
--- a/build-scripts/debian-recursor/rules
+++ b/build-scripts/debian-recursor/rules
@@ -46,6 +46,7 @@ override_dh_auto_configure:
                --libdir='$${prefix}/lib/$(DEB_HOST_MULTIARCH)' \
                --libexecdir='$${prefix}/lib' \
                --enable-unit-tests \
+               --without-protobuf \
                $(ENABLE_SYSTEMD)
 
 override_dh_auto_install: