Skip to content

Commit 24c34b4

Browse files
committed
Update libmultiprocess library
Add recent changes to support C++20 and fix some build issues: bitcoin-core/libmultiprocess#89 pkgconfig: Drop -std=c++17 compile flag bitcoin-core/libmultiprocess#90 pkgconfig: Use @CMAKE_INSTALL_LIBDIR@ variable
1 parent 727d888 commit 24c34b4

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

depends/packages/native_libmultiprocess.mk

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
11
package=native_libmultiprocess
2+
<<<<<<< HEAD
23
$(package)_version=8da797c5f1644df1bffd84d10c1ae9836dc70d60
4+
||||||| parent of 56ef459b5734 (Update libmultiprocess library)
5+
$(package)_version=414542f81e0997354b45b8ade13ca144a3e35ff1
6+
=======
7+
$(package)_version=2cbbd09d8b9972a8f5c68b510c0dae9a9f7a22da
8+
>>>>>>> 56ef459b5734 (Update libmultiprocess library)
39
$(package)_download_path=https://github.com/chaincodelabs/libmultiprocess/archive
410
$(package)_file_name=$($(package)_version).tar.gz
11+
<<<<<<< HEAD
512
$(package)_sha256_hash=030f4d393d2ac9deba98d2e1973e22fc439ffc009d5f8ae3225c90639f86beb0
13+
||||||| parent of 56ef459b5734 (Update libmultiprocess library)
14+
$(package)_sha256_hash=8542dbaf8c4fce8fd7af6929f5dc9b34dffa51c43e9ee360e93ee0f34b180bc2
15+
=======
16+
$(package)_sha256_hash=a86416908cc4d27a41c58d846ca854730b1c56bd7a58d823348969e300a10014
17+
>>>>>>> 56ef459b5734 (Update libmultiprocess library)
618
$(package)_dependencies=native_capnp
719

820
define $(package)_config_cmds

0 commit comments

Comments
 (0)