Skip to content

Commit 842b767

Browse files
authored
Upgrade bundled zeroconf and fix bundle-build (#230)
This upgrades the bundled zeroconf to version 0.147.0 and fixes a build mistake where the bundled zeroconf was only used iff the bundled grpc was used.
1 parent 68251fc commit 842b767

File tree

136 files changed

+13480
-9250
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+13480
-9250
lines changed

src/meson.build

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ if bundle_grpc
6565
dependency('python3')
6666
current_grpc_version = '1.73.1'
6767
current_protobuf_version = '6.31.1'
68-
current_zeroconf_version = '0.115.2'
6968

7069
setup = join_paths(meson_source_root, 'grpcio-' + current_grpc_version, 'build_script.py')
7170

@@ -79,17 +78,22 @@ if bundle_grpc
7978

8079
setup = join_paths(meson_source_root, 'protobuf-' + current_protobuf_version, 'build_script.py')
8180

82-
grpc = custom_target('proto_build',
81+
proto = custom_target('proto_build',
8382
output: 'google',
8483
command: [setup, join_paths(meson_source_root, 'protobuf-' + current_protobuf_version), join_paths(meson.current_build_dir(), 'google')],
8584
install: true,
8685
install_dir: install_libdir,
8786
build_by_default: true,
8887
)
88+
endif
89+
90+
if bundle_zeroconf
91+
dependency('python3')
92+
current_zeroconf_version = '0.147.0'
8993

9094
setup = join_paths(meson_source_root, 'zeroconf-' + current_zeroconf_version, 'build_script.py')
9195

92-
grpc = custom_target('zeroconf_build',
96+
zeroconf = custom_target('zeroconf_build',
9397
output: 'zeroconf',
9498
command: [setup, join_paths(meson_source_root, 'zeroconf-' + current_zeroconf_version), join_paths(meson.current_build_dir(), 'zeroconf')],
9599
install: true,
@@ -104,4 +108,4 @@ if bundle_landlock
104108
install_dir: join_paths(install_libdir, 'landlock'),
105109
strip_directory: true
106110
)
107-
endif
111+
endif

src/zeroconf-0.115.2/CHANGELOG.md

Lines changed: 0 additions & 1753 deletions
This file was deleted.

src/zeroconf-0.115.2/build_ext.py

Lines changed: 0 additions & 50 deletions
This file was deleted.

src/zeroconf-0.115.2/docs/Makefile

Lines changed: 0 additions & 177 deletions
This file was deleted.

0 commit comments

Comments
 (0)