Skip to content

Commit 57c1927

Browse files
committed
Merge bitcoin/bitcoin#25322: build: Fix capnp package build for Android
8b8edc2 build: Specify native binaries explicitly when building `capnp` package (Hennadii Stepanov) a413595 build: Fix `capnp` package build for Android (Hennadii Stepanov) Pull request description: On master (e3c08eb): ``` $ make -C depends capnp MULTIPROCESS=1 HOST=aarch64-linux-android ANDROID_SDK=$ANDROID_HOME ANDROID_NDK=$ANDROID_HOME/ndk/23.2.8568313 ANDROID_API_LEVEL=28 ANDROID_TOOLCHAIN_BIN=$ANDROID_HOME/ndk/23.2.8568313/toolchains/llvm/prebuilt/linux-x86_64/bin ... ld: error: unable to find library -lkj ... ``` This PR fixes this error, and also improves configuring according to the docs. ACKs for top commit: ryanofsky: Code review ACK 8b8edc2. I'd be a little curious to know what causes the error and how `--disable-shared` fixes it, but these changes all look good Tree-SHA512: 1b07b75f2a83932d8dc1f007e42a67d8327bd5fe4566f554dab4599e2a1e04b0144648790a1fd2ab1c295dba728586035aa0ebdbe5cf49df048ec87736895aaf
2 parents 2397574 + 8b8edc2 commit 57c1927

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

depends/packages/capnp.mk

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,15 @@ $(package)_file_name=$(native_$(package)_file_name)
66
$(package)_sha256_hash=$(native_$(package)_sha256_hash)
77
$(package)_dependencies=native_$(package)
88

9+
define $(package)_set_vars :=
10+
$(package)_config_opts := --with-external-capnp
11+
$(package)_config_opts += CAPNP="$$(native_capnp_prefixbin)/capnp"
12+
$(package)_config_opts += CAPNP_CXX="$$(native_capnp_prefixbin)/capnp-c++"
13+
$(package)_config_opts_android := --disable-shared
14+
endef
15+
916
define $(package)_config_cmds
10-
$($(package)_autoconf) --with-external-capnp
17+
$($(package)_autoconf)
1118
endef
1219

1320
define $(package)_build_cmds

0 commit comments

Comments
 (0)