Skip to content

Commit 26747d9

Browse files
committed
Merge bitcoin/bitcoin#32760: depends: capnp 1.2.0
c7eaac3 depends: capnp 1.2.0 (fanquake) Pull request description: See capnproto/capnproto@release-1.1.0...release-1.2.0. We can drop all the patches we are currently applying. ACKs for top commit: Sjors: ACK c7eaac3 theStack: ACK c7eaac3 ryanofsky: Code review ACK c7eaac3. Just checked hashes, compared tarball to git and diffed 1.1.0 and 1.2.0 tarballs which showed only minor and expected changes. Tree-SHA512: 75085ec96952e9693c67531c3d04cd0d7df580dd1df35ce50dff618b29f651674c17a84e9089c6b7ed230e2b4fd0a7f24e2220e983ec00235db9a9d1ee2d7116
2 parents 084eee0 + c7eaac3 commit 26747d9

File tree

5 files changed

+2
-227
lines changed

5 files changed

+2
-227
lines changed

depends/packages/capnp.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ $(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)_patches=abi_placement_new.patch
8-
$(package)_patches += fix_openbsd_build.patch
97

108
define $(package)_set_vars
119
$(package)_config_opts := -DBUILD_TESTING=OFF
@@ -14,11 +12,6 @@ define $(package)_set_vars
1412
$(package)_cxxflags += -fdebug-prefix-map=$($(package)_extract_dir)=/usr -fmacro-prefix-map=$($(package)_extract_dir)=/usr
1513
endef
1614

17-
define $(package)_preprocess_cmds
18-
patch -p2 < $($(package)_patch_dir)/abi_placement_new.patch && \
19-
patch -p2 < $($(package)_patch_dir)/fix_openbsd_build.patch
20-
endef
21-
2215
define $(package)_config_cmds
2316
$($(package)_cmake) .
2417
endef

depends/packages/native_capnp.mk

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
package=native_capnp
2-
$(package)_version=1.1.0
2+
$(package)_version=1.2.0
33
$(package)_download_path=https://capnproto.org/
44
$(package)_download_file=capnproto-c++-$($(package)_version).tar.gz
55
$(package)_file_name=capnproto-cxx-$($(package)_version).tar.gz
6-
$(package)_sha256_hash=07167580e563f5e821e3b2af1c238c16ec7181612650c5901330fa9a0da50939
7-
$(package)_patches=fix_openbsd_build.patch
6+
$(package)_sha256_hash=ed00e44ecbbda5186bc78a41ba64a8dc4a861b5f8d4e822959b0144ae6fd42ef
87

98
define $(package)_set_vars
109
$(package)_config_opts := -DBUILD_TESTING=OFF
1110
$(package)_config_opts += -DWITH_OPENSSL=OFF
1211
$(package)_config_opts += -DWITH_ZLIB=OFF
1312
endef
1413

15-
define $(package)_preprocess_cmds
16-
patch -p2 < $($(package)_patch_dir)/fix_openbsd_build.patch
17-
endef
18-
1914
define $(package)_config_cmds
2015
$($(package)_cmake) .
2116
endef

depends/patches/capnp/abi_placement_new.patch

Lines changed: 0 additions & 71 deletions
This file was deleted.

depends/patches/capnp/fix_openbsd_build.patch

Lines changed: 0 additions & 71 deletions
This file was deleted.

depends/patches/native_capnp/fix_openbsd_build.patch

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)