Skip to content

Commit 6d57909

Browse files
committed
Merge bitcoin/bitcoin#28856: depends: Build the native_capnp and capnp packages with CMake
11d797e depends: Build `native_capnp` package with CMake (Hennadii Stepanov) 90389c9 depends: Build `capnp` package with CMake (Hennadii Stepanov) Pull request description: The first commit fixes two bugs when cross-compiling the `capnp` package on the master branch @ 160d236: - for `x86_64-w64-mingw32` (see bitcoin/bitcoin#28735 (comment)): ``` libtool: link: x86_64-w64-mingw32-g++-posix -shared -nostdlib /usr/lib/gcc/x86_64-w64-mingw32/12-posix/../../../../x86_64-w64-mingw32/lib/dllcrt2.o /usr/lib/gcc/x86_64-w64-mingw32/12-posix/crtbegin.o src/kj/.libs/cidr.o src/kj/.libs/common.o src/kj/.libs/units.o src/kj/.libs/memory.o src/kj/.libs/refcount.o src/kj/.libs/array.o src/kj/.libs/list.o src/kj/.libs/string.o src/kj/.libs/string-tree.o src/kj/.libs/source-location.o src/kj/.libs/hash.o src/kj/.libs/table.o src/kj/.libs/encoding.o src/kj/.libs/exception.o src/kj/.libs/debug.o src/kj/.libs/arena.o src/kj/.libs/io.o src/kj/.libs/mutex.o src/kj/.libs/thread.o src/kj/.libs/time.o src/kj/.libs/filesystem.o src/kj/.libs/filesystem-disk-unix.o src/kj/.libs/filesystem-disk-win32.o src/kj/.libs/test-helpers.o src/kj/.libs/main.o src/kj/parse/.libs/char.o -L/home/hebasto/git/bitcoin/depends/x86_64-w64-mingw32/lib -L/usr/lib/gcc/x86_64-w64-mingw32/12-posix -L/usr/lib/gcc/x86_64-w64-mingw32/12-posix/../../../../x86_64-w64-mingw32/lib -lstdc++ -lmingw32 -lgcc_s -lgcc -lmoldname -lmingwex -lmsvcrt -lkernel32 -lpthread -ladvapi32 -lshell32 -luser32 -lkernel32 -lmingw32 -lgcc_s -lgcc -lmoldname -lmingwex -lmsvcrt -lkernel32 /usr/lib/gcc/x86_64-w64-mingw32/12-posix/crtend.o -mthreads -O2 -mthreads -mthreads -o .libs/libkj-1-0-1.dll -Wl,--enable-auto-image-base -Xlinker --out-implib -Xlinker .libs/libkj.dll.a /usr/bin/x86_64-w64-mingw32-ld: src/kj/.libs/cidr.o:cidr.c++:(.text+0x1dc): undefined reference to `__imp_inet_ntop' /usr/bin/x86_64-w64-mingw32-ld: src/kj/.libs/cidr.o:cidr.c++:(.text+0x44b): undefined reference to `__imp_inet_pton' collect2: error: ld returned 1 exit status ``` - for `arm64-apple-darwin`: ``` checking build system type... x86_64-pc-linux-gnu checking host system type... Invalid configuration `arm64-apple-darwin': machine `arm64-apple' not recognized configure: error: /bin/bash build-aux/config.sub arm64-apple-darwin failed ``` The second commit applies the same changes for the `native_capnp` package for [consistency](bitcoin/bitcoin#28856 (comment)). ACKs for top commit: ryanofsky: Code review ACK 11d797e. Since last review arm64-apple-darwin platform is now mentioned in the commit message, and the change to `depends/packages/libmultiprocess.mk` in d1604d4b1d1ee8df279a1776303e167cc3d06193 which was unrelated (but probably still a good optimization) was reverted. Tree-SHA512: c636e53073ce6fcda9724723bc59f3990fa9629a3b2f73d93dbc102a5a1badfbe8f4c5fef841f03588ebcad5cd4883f3ce32b128afcd75f6bc21eb801796a586
2 parents b3ab0c3 + 11d797e commit 6d57909

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

depends/packages/capnp.mk

+8-7
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

depends/packages/native_capnp.mk

+8-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ $(package)_file_name=capnproto-cxx-$($(package)_version).tar.gz
66
$(package)_sha256_hash=0f7f4b8a76a2cdb284fddef20de8306450df6dd031a47a15ac95bc43c3358e09
77

88
define $(package)_set_vars
9-
$(package)_config_opts = --without-openssl
9+
$(package)_config_opts := -DBUILD_TESTING=OFF
10+
$(package)_config_opts += -DWITH_OPENSSL=OFF
11+
$(package)_config_opts += -DWITH_ZLIB=OFF
1012
endef
1113

1214
define $(package)_config_cmds
13-
$($(package)_autoconf)
15+
$($(package)_cmake) .
1416
endef
1517

1618
define $(package)_build_cmds
@@ -20,3 +22,7 @@ endef
2022
define $(package)_stage_cmds
2123
$(MAKE) DESTDIR=$($(package)_staging_dir) install
2224
endef
25+
26+
define $(package)_postprocess_cmds
27+
rm -rf lib/pkgconfig
28+
endef

0 commit comments

Comments
 (0)