From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Wed, 4 Jun 2025 07:32:14 +0000 (+0200)
Subject: meson: avoid protoc-c, as it's (reported as) deprecated
X-Git-Tag: v6.0.15~15^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fenvironments%2Fdocs-protoc-c-zfcn52%2Fdeployments%2F6995;p=thirdparty%2Fknot-resolver.git

meson: avoid protoc-c, as it's (reported as) deprecated

> `protoc-c` is deprecated. Please use `protoc` instead!
---

diff --git a/distro/pkg/rpm/knot-resolver.spec b/distro/pkg/rpm/knot-resolver.spec
index 504ae7ed7..41cc1da23 100644
--- a/distro/pkg/rpm/knot-resolver.spec
+++ b/distro/pkg/rpm/knot-resolver.spec
@@ -68,7 +68,7 @@ Recommends:     python3-prometheus_client
 Recommends:     python3-watchdog
 
 # dnstap module dependencies
-# SUSE is missing protoc-c protobuf compiler
+# SUSE is missing protoc protobuf compiler
 %if "x%{?suse_version}" == "x"
 BuildRequires:  pkgconfig(libfstrm)
 BuildRequires:  pkgconfig(libprotobuf-c)
diff --git a/modules/dnstap/meson.build b/modules/dnstap/meson.build
index 038bf3e3d..07cece592 100644
--- a/modules/dnstap/meson.build
+++ b/modules/dnstap/meson.build
@@ -12,9 +12,9 @@ if get_option('dnstap') != 'disabled'
   message('--- dnstap module dependencies ---')
   libprotobuf_c = dependency('libprotobuf-c', version: '>=1', required: dnstap_required)
   libfstrm = dependency('libfstrm', version: '>=0.2', required: dnstap_required)
-  protoc_c = find_program('protoc-c', required: dnstap_required)
+  protoc = find_program(['protoc', 'protoc-c'], required: dnstap_required)
   message('----------------------------------')
-  if libprotobuf_c.found() and libfstrm.found() and protoc_c.found()
+  if libprotobuf_c.found() and libfstrm.found() and protoc.found()
     build_dnstap = true
   endif
 endif
@@ -23,11 +23,11 @@ endif
 if build_dnstap
   c_src_lint += dnstap_src
 
-  # generate protobuf-c sources using protoc-c
+  # generate protobuf-c sources using protoc
   dnstap_pb = custom_target(
     'dnstap_pb',
     command: [
-      protoc_c,
+      protoc,
       '--c_out=' + meson.current_build_dir(),
       '--proto_path', meson.current_source_dir(),
       meson.current_source_dir() / 'dnstap.proto',