From a413595c37f51557f9506e0a279cd80fc9a6fb36 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Thu, 9 Jun 2022 14:38:26 +0200
Subject: build: Fix `capnp` package build for Android

---
 depends/packages/capnp.mk | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'depends')

diff --git a/depends/packages/capnp.mk b/depends/packages/capnp.mk
index 8a3a14810d..cd9b91cf7c 100644
--- a/depends/packages/capnp.mk
+++ b/depends/packages/capnp.mk
@@ -6,8 +6,13 @@ $(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_android := --disable-shared
+endef
+
 define $(package)_config_cmds
-  $($(package)_autoconf) --with-external-capnp
+  $($(package)_autoconf)
 endef
 
 define $(package)_build_cmds
-- 
cgit v1.2.3


From 8b8edc25c13a3e613770bf38b21a2556192e6315 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Thu, 9 Jun 2022 15:49:54 +0200
Subject: build: Specify native binaries explicitly when building `capnp`
 package

From `configure --help`:
  --with-external-capnp   use the system capnp binary (or the one specified
                          with $CAPNP) instead of compiling a new one (useful
                          for cross-compiling)
---
 depends/packages/capnp.mk | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'depends')

diff --git a/depends/packages/capnp.mk b/depends/packages/capnp.mk
index cd9b91cf7c..f4778c1ecd 100644
--- a/depends/packages/capnp.mk
+++ b/depends/packages/capnp.mk
@@ -8,6 +8,8 @@ $(package)_dependencies=native_$(package)
 
 define $(package)_set_vars :=
 $(package)_config_opts := --with-external-capnp
+$(package)_config_opts += CAPNP="$$(native_capnp_prefixbin)/capnp"
+$(package)_config_opts += CAPNP_CXX="$$(native_capnp_prefixbin)/capnp-c++"
 $(package)_config_opts_android := --disable-shared
 endef
 
-- 
cgit v1.2.3