forked from bitcoin/bitcoin
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4356 from kittywhiskers/depends
merge bitcoin#18820, bitcoin#19764, bitcoin#13686, bitcoin#17538, bitcoin#18405: zmq backports, boost depends split
- Loading branch information
Showing
19 changed files
with
240 additions
and
309 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,40 +1,44 @@ | ||
package=boost | ||
$(package)_version=1_70_0 | ||
$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/1.70.0/source/ | ||
$(package)_file_name=$(package)_$($(package)_version).tar.bz2 | ||
$(package)_sha256_hash=430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778 | ||
$(package)_version=1_71_0 | ||
$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/$(subst _,.,$($(package)_version))/source/ | ||
$(package)_file_name=boost_$($(package)_version).tar.bz2 | ||
$(package)_sha256_hash=d73a8da01e8bf8c7eda40b4c84915071a8c8a0df4a6734537ddde4a8580524ee | ||
$(package)_dependencies=native_b2 | ||
|
||
define $(package)_set_vars | ||
$(package)_config_opts_release=variant=release | ||
$(package)_config_opts_debug=variant=debug | ||
$(package)_config_opts=--layout=tagged --build-type=complete --user-config=user-config.jam | ||
$(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1 | ||
$(package)_config_opts_linux=threadapi=pthread runtime-link=shared | ||
$(package)_config_opts_darwin=--toolset=clang-darwin runtime-link=shared | ||
$(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static | ||
$(package)_config_opts_x86_64_mingw32=address-model=64 | ||
$(package)_config_opts_i686_mingw32=address-model=32 | ||
$(package)_config_opts_i686_linux=address-model=32 architecture=x86 | ||
$(package)_config_opts+=threading=multi link=static -sNO_COMPRESSION=1 | ||
$(package)_config_opts_linux=target-os=linux threadapi=pthread runtime-link=shared | ||
$(package)_config_opts_darwin=target-os=darwin runtime-link=shared | ||
$(package)_config_opts_mingw32=target-os=windows binary-format=pe threadapi=win32 runtime-link=static | ||
$(package)_config_opts_x86_64=architecture=x86 address-model=64 | ||
$(package)_config_opts_i686=architecture=x86 address-model=32 | ||
$(package)_config_opts_aarch64=address-model=64 | ||
$(package)_config_opts_armv7a=address-model=32 | ||
ifneq (,$(findstring clang,$($(package)_cxx))) | ||
$(package)_toolset_$(host_os)=clang | ||
else | ||
$(package)_toolset_$(host_os)=gcc | ||
$(package)_archiver_$(host_os)=$($(package)_ar) | ||
$(package)_toolset_darwin=clang-darwin | ||
endif | ||
$(package)_config_libraries=chrono,filesystem,system,thread,test | ||
$(package)_cxxflags=-std=c++11 -fvisibility=hidden | ||
$(package)_cxxflags_linux=-fPIC | ||
endef | ||
|
||
define $(package)_preprocess_cmds | ||
echo "using $($(package)_toolset_$(host_os)) : : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$($(package)_archiver_$(host_os))\" <striper>\"$(host_STRIP)\" <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam | ||
echo "using $($(package)_toolset_$(host_os)) : : $($(package)_cxx) : <cflags>\"$($(package)_cflags)\" <cxxflags>\"$($(package)_cxxflags)\" <compileflags>\"$($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$($(package)_ar)\" <striper>\"$(host_STRIP)\" <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam | ||
endef | ||
|
||
define $(package)_config_cmds | ||
./bootstrap.sh --without-icu --with-libraries=$($(package)_config_libraries) | ||
./bootstrap.sh --without-icu --with-libraries=$($(package)_config_libraries) --with-toolset=$($(package)_toolset_$(host_os)) --with-bjam=b2 | ||
endef | ||
|
||
define $(package)_build_cmds | ||
./b2 -d2 -j2 -d1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) stage | ||
b2 -d2 -j2 -d1 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) toolset=$($(package)_toolset_$(host_os)) stage | ||
endef | ||
|
||
define $(package)_stage_cmds | ||
./b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) install | ||
b2 -d0 -j4 --prefix=$($(package)_staging_prefix_dir) $($(package)_config_opts) toolset=$($(package)_toolset_$(host_os)) install | ||
endef |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
package=native_b2 | ||
$(package)_version=$(boost_version) | ||
$(package)_download_path=$(boost_download_path) | ||
$(package)_file_name=$(boost_file_name) | ||
$(package)_sha256_hash=$(boost_sha256_hash) | ||
$(package)_build_subdir=tools/build/src/engine | ||
ifneq (,$(findstring clang,$($(package)_cxx))) | ||
$(package)_toolset_$(host_os)=clang | ||
else | ||
$(package)_toolset_$(host_os)=gcc | ||
endif | ||
|
||
define $(package)_build_cmds | ||
CXX="$($(package)_cxx)" CXXFLAGS="$($(package)_cxxflags)" ./build.sh "$($(package)_toolset_$(host_os))" | ||
endef | ||
|
||
define $(package)_stage_cmds | ||
mkdir -p "$($(package)_staging_prefix_dir)"/bin/ && \ | ||
cp b2 "$($(package)_staging_prefix_dir)"/bin/ | ||
endef |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 0 additions & 30 deletions
30
depends/patches/zeromq/0001-fix-build-with-older-mingw64.patch
This file was deleted.
Oops, something went wrong.
35 changes: 0 additions & 35 deletions
35
depends/patches/zeromq/0002-disable-pthread_set_name_np.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.