From f75411352b72b4a73b95854b79201862ade8b171 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 4 Jun 2025 09:32:14 +0200 Subject: [PATCH] meson: avoid protoc-c, as it's (reported as) deprecated > `protoc-c` is deprecated. Please use `protoc` instead! --- distro/pkg/rpm/knot-resolver.spec | 2 +- modules/dnstap/meson.build | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) 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', -- 2.47.2