Skip to content

Commit 90389c9

Browse files
committed
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.
1 parent 160d236 commit 90389c9

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

depends/packages/capnp.mk

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,15 @@ $(package)_download_path=$(native_$(package)_download_path)
44
$(package)_download_file=$(native_$(package)_download_file)
55
$(package)_file_name=$(native_$(package)_file_name)
66
$(package)_sha256_hash=$(native_$(package)_sha256_hash)
7-
$(package)_dependencies=native_$(package)
87

98
define $(package)_set_vars :=
10-
$(package)_config_opts := --with-external-capnp
11-
$(package)_config_opts += --without-openssl
12-
$(package)_config_opts += CAPNP="$$(native_capnp_prefixbin)/capnp"
13-
$(package)_config_opts += CAPNP_CXX="$$(native_capnp_prefixbin)/capnp-c++"
14-
$(package)_config_opts_android := --disable-shared
9+
$(package)_config_opts := -DBUILD_TESTING=OFF
10+
$(package)_config_opts += -DWITH_OPENSSL=OFF
11+
$(package)_config_opts += -DWITH_ZLIB=OFF
1512
endef
1613

1714
define $(package)_config_cmds
18-
$($(package)_autoconf)
15+
$($(package)_cmake) .
1916
endef
2017

2118
define $(package)_build_cmds
@@ -25,3 +22,7 @@ endef
2522
define $(package)_stage_cmds
2623
$(MAKE) DESTDIR=$($(package)_staging_dir) install
2724
endef
25+
26+
define $(package)_postprocess_cmds
27+
rm -rf lib/pkgconfig
28+
endef

0 commit comments

Comments
 (0)