From 90389c95e9edf3d705fb9376388c83f07d1a570e Mon Sep 17 00:00:00 2001 From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> Date: Mon, 4 Dec 2023 14:39:58 +0000 Subject: [PATCH] depends: Build `capnp` package with CMake This change fixes the `capnp` package cross-compiling for the `x86_64-w64-mingw32` and `arm64-apple-darwin` platforms. --- depends/packages/capnp.mk | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/depends/packages/capnp.mk b/depends/packages/capnp.mk index 47df202771..1c1a77eb16 100644 --- a/depends/packages/capnp.mk +++ b/depends/packages/capnp.mk @@ -4,18 +4,15 @@ $(package)_download_path=$(native_$(package)_download_path) $(package)_download_file=$(native_$(package)_download_file) $(package)_file_name=$(native_$(package)_file_name) $(package)_sha256_hash=$(native_$(package)_sha256_hash) -$(package)_dependencies=native_$(package) define $(package)_set_vars := -$(package)_config_opts := --with-external-capnp -$(package)_config_opts += --without-openssl -$(package)_config_opts += CAPNP="$$(native_capnp_prefixbin)/capnp" -$(package)_config_opts += CAPNP_CXX="$$(native_capnp_prefixbin)/capnp-c++" -$(package)_config_opts_android := --disable-shared +$(package)_config_opts := -DBUILD_TESTING=OFF +$(package)_config_opts += -DWITH_OPENSSL=OFF +$(package)_config_opts += -DWITH_ZLIB=OFF endef define $(package)_config_cmds - $($(package)_autoconf) + $($(package)_cmake) . endef define $(package)_build_cmds @@ -25,3 +22,7 @@ endef define $(package)_stage_cmds $(MAKE) DESTDIR=$($(package)_staging_dir) install endef + +define $(package)_postprocess_cmds + rm -rf lib/pkgconfig +endef