aboutsummaryrefslogtreecommitdiff
path: root/depends
diff options
context:
space:
mode:
Diffstat (limited to 'depends')
-rw-r--r--depends/packages/capnp.mk15
-rw-r--r--depends/packages/native_capnp.mk10
2 files changed, 16 insertions, 9 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
diff --git a/depends/packages/native_capnp.mk b/depends/packages/native_capnp.mk
index ad87eed354..484e78d5d9 100644
--- a/depends/packages/native_capnp.mk
+++ b/depends/packages/native_capnp.mk
@@ -6,11 +6,13 @@ $(package)_file_name=capnproto-cxx-$($(package)_version).tar.gz
$(package)_sha256_hash=0f7f4b8a76a2cdb284fddef20de8306450df6dd031a47a15ac95bc43c3358e09
define $(package)_set_vars
- $(package)_config_opts = --without-openssl
+ $(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
@@ -20,3 +22,7 @@ endef
define $(package)_stage_cmds
$(MAKE) DESTDIR=$($(package)_staging_dir) install
endef
+
+define $(package)_postprocess_cmds
+ rm -rf lib/pkgconfig
+endef