GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-08-08 09:21:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Address build warning

Browse Source 
[libprotobuf WARNING protoc-gen-c/main.cc:44] `protoc-c` is deprecated. Please use `protoc` instead!

Signed-off-by: Dimitri Papadopoulos <3350651-DimitriPapadopoulos@users.noreply.gitlab.com>
This commit is contained in:
Dimitri Papadopoulos
2026-05-09 10:16:00 +02:00
parent 2548a27b51
commit c30bd5dca4
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist-script.sh
+2 -2
View File
@@ -18,9 +18,9 @@ require_cmd() {
# Protocol buffers: ipc.proto and ctl.proto # Protocol buffers: ipc.proto and ctl.proto
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
PROTOC=$(command -v protoc-c 2>/dev/null || command -v protoc 2>/dev/null || true) PROTOC=$(command -v protoc 2>/dev/null || command -v protoc-c 2>/dev/null || true)
if [ -z "$PROTOC" ]; then if [ -z "$PROTOC" ]; then
echo "dist-script: ERROR: protoc-c/protoc not found; install it to create a dist tarball" >&2 echo "dist-script: ERROR: protoc/protoc-c not found; install it to create a dist tarball" >&2
exit 1 exit 1
fi fi
"$PROTOC" --c_out="$DISTROOT/src" \ "$PROTOC" --c_out="$DISTROOT/src" \
meson.build
+3 -3
View File
@@ -38,9 +38,9 @@ endif
# Required tools # Required tools
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
gperf = find_program('gperf', required: false) gperf = find_program('gperf', required: false)
protoc_c = find_program('protoc-c', required: false) protoc = find_program(['protoc', 'protoc-c'], required: false)
ipcalc = find_program(['ipcalc', 'ipcalc-ng'], required: false) ipcalc = find_program(['ipcalc', 'ipcalc-ng'], required: false)
# Firewall script selection # Firewall script selection
_fw_opt = get_option('firewall-script') _fw_opt = get_option('firewall-script')
src/meson.build
+4 -4
View File
@@ -55,25 +55,25 @@ version_inc = configure_file(
) )
# Protocol buffers # Protocol buffers
if protoc_c.found() if protoc.found()
ipc_proto = custom_target('ipc-proto', ipc_proto = custom_target('ipc-proto',
input: 'ipc.proto', input: 'ipc.proto',
output: ['ipc.pb-c.c', 'ipc.pb-c.h'], output: ['ipc.pb-c.c', 'ipc.pb-c.h'],
command: [protoc_c, '--c_out=@OUTDIR@', command: [protoc, '--c_out=@OUTDIR@',
'--proto_path=@CURRENT_SOURCE_DIR@', '@INPUT@'], '--proto_path=@CURRENT_SOURCE_DIR@', '@INPUT@'],
) )
ctl_proto = custom_target('ctl-proto', ctl_proto = custom_target('ctl-proto',
input: 'ctl.proto', input: 'ctl.proto',
output: ['ctl.pb-c.c', 'ctl.pb-c.h'], output: ['ctl.pb-c.c', 'ctl.pb-c.h'],
depends: ipc_proto, depends: ipc_proto,
command: [protoc_c, '--c_out=@OUTDIR@', command: [protoc, '--c_out=@OUTDIR@',
'--proto_path=@CURRENT_SOURCE_DIR@', '@INPUT@'], '--proto_path=@CURRENT_SOURCE_DIR@', '@INPUT@'],
) )
cfg_proto = custom_target('cfg-proto', cfg_proto = custom_target('cfg-proto',
input: 'cfg.proto', input: 'cfg.proto',
output: ['cfg.pb-c.c', 'cfg.pb-c.h'], output: ['cfg.pb-c.c', 'cfg.pb-c.h'],
depends: ipc_proto, depends: ipc_proto,
command: [protoc_c, '--c_out=@OUTDIR@', command: [protoc, '--c_out=@OUTDIR@',
'--proto_path=@CURRENT_SOURCE_DIR@', '@INPUT@'], '--proto_path=@CURRENT_SOURCE_DIR@', '@INPUT@'],
) )
elif fs.exists('ipc.pb-c.c') and fs.exists('ctl.pb-c.c') and fs.exists('cfg.pb-c.c') elif fs.exists('ipc.pb-c.c') and fs.exists('ctl.pb-c.c') and fs.exists('cfg.pb-c.c')