mirror of
https://github.com/feather-wallet/feather.git
synced 2024-12-22 19:49:28 +00:00
depends: boost: update to 1.82.0
This commit is contained in:
parent
bd9a0f37f0
commit
4995e97dc5
6 changed files with 16 additions and 69 deletions
|
@ -1,19 +1,17 @@
|
||||||
package=boost
|
package=boost
|
||||||
$(package)_version=1.68.0
|
$(package)_version=1.82.0
|
||||||
$(package)_download_path=https://downloads.sourceforge.net/project/boost/boost/$($(package)_version)/
|
$(package)_download_path=https://downloads.sourceforge.net/project/boost/boost/$($(package)_version)/
|
||||||
$(package)_file_name=$(package)_$(subst .,_,$($(package)_version)).tar.bz2
|
$(package)_file_name=$(package)_$(subst .,_,$($(package)_version)).tar.bz2
|
||||||
$(package)_sha256_hash=7f6130bc3cf65f56a618888ce9d5ea704fa10b462be126ad053e80e553d6d8b7
|
$(package)_sha256_hash=a6e1ab9b0860e6a2881dd7b21fe9f737a095e5f33a3a874afc6a345228597ee6
|
||||||
$(package)_dependencies=libiconv
|
$(package)_dependencies=libiconv
|
||||||
$(package)_patches=fix_aroptions.patch fix_arm_arch.patch fix_coalesce.patch
|
|
||||||
|
|
||||||
define $(package)_set_vars
|
define $(package)_set_vars
|
||||||
$(package)_config_opts_release=variant=release
|
$(package)_config_opts=variant=release
|
||||||
$(package)_config_opts_debug=variant=debug
|
$(package)_config_opts+=--layout=system --user-config=user-config.jam
|
||||||
$(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 -sICONV_PATH=$(host_prefix)
|
||||||
$(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1
|
$(package)_config_opts_linux=threadapi=pthread runtime-link=static
|
||||||
$(package)_config_opts_linux=threadapi=pthread runtime-link=shared
|
|
||||||
$(package)_config_opts_android=threadapi=pthread runtime-link=static target-os=android
|
$(package)_config_opts_android=threadapi=pthread runtime-link=static target-os=android
|
||||||
$(package)_config_opts_darwin=--toolset=darwin runtime-link=static
|
$(package)_config_opts_darwin=--toolset=darwin runtime-link=shared target-os=darwin
|
||||||
$(package)_config_opts_mingw32=binary-format=pe target-os=windows threadapi=win32 runtime-link=static
|
$(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_x86_64_mingw32=address-model=64
|
||||||
$(package)_config_opts_i686_mingw32=address-model=32
|
$(package)_config_opts_i686_mingw32=address-model=32
|
||||||
|
@ -29,9 +27,6 @@ $(package)_cxxflags_freebsd=-fPIC
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define $(package)_preprocess_cmds
|
define $(package)_preprocess_cmds
|
||||||
patch -p1 < $($(package)_patch_dir)/fix_aroptions.patch &&\
|
|
||||||
patch -p1 < $($(package)_patch_dir)/fix_arm_arch.patch &&\
|
|
||||||
patch -p1 < $($(package)_patch_dir)/fix_coalesce.patch &&\
|
|
||||||
echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$(boost_archiver_$(host_os))\" <arflags>\"$($(package)_arflags)\" <striper>\"$(host_STRIP)\" <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam
|
echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$(boost_archiver_$(host_os))\" <arflags>\"$($(package)_arflags)\" <striper>\"$(host_STRIP)\" <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- boost_1_64_0/tools/build/src/tools/darwin.jam.O 2017-04-17 03:22:26.000000000 +0100
|
|
||||||
+++ boost_1_64_0/tools/build/src/tools/darwin.jam 2022-05-04 17:26:29.984464447 +0000
|
|
||||||
@@ -505,7 +505,7 @@
|
|
||||||
if $(instruction-set) {
|
|
||||||
options = -arch$(_)$(instruction-set) ;
|
|
||||||
} else {
|
|
||||||
- options = -arch arm ;
|
|
||||||
+# options = -arch arm ;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,28 +0,0 @@
|
||||||
--- boost_1_64_0/tools/build/src/tools/gcc.jam.O 2017-04-17 03:22:26.000000000 +0100
|
|
||||||
+++ boost_1_64_0/tools/build/src/tools/gcc.jam 2019-11-15 15:46:16.957937137 +0000
|
|
||||||
@@ -243,6 +243,8 @@
|
|
||||||
{
|
|
||||||
ECHO notice: using gcc archiver :: $(condition) :: $(archiver[1]) ;
|
|
||||||
}
|
|
||||||
+ local arflags = [ feature.get-values <arflags> : $(options) ] ;
|
|
||||||
+ toolset.flags gcc.archive .ARFLAGS $(condition) : $(arflags) ;
|
|
||||||
|
|
||||||
# - Ranlib.
|
|
||||||
local ranlib = [ common.get-invocation-command gcc
|
|
||||||
@@ -970,6 +972,7 @@
|
|
||||||
# logic in intel-linux, but that is hardly worth the trouble as on Linux, 'ar'
|
|
||||||
# is always available.
|
|
||||||
.AR = ar ;
|
|
||||||
+.ARFLAGS = rc ;
|
|
||||||
.RANLIB = ranlib ;
|
|
||||||
|
|
||||||
toolset.flags gcc.archive AROPTIONS <archiveflags> ;
|
|
||||||
@@ -1011,7 +1014,7 @@
|
|
||||||
#
|
|
||||||
actions piecemeal archive
|
|
||||||
{
|
|
||||||
- "$(.AR)" $(AROPTIONS) rc "$(<)" "$(>)"
|
|
||||||
+ "$(.AR)" $(AROPTIONS) $(.ARFLAGS) "$(<)" "$(>)"
|
|
||||||
"$(.RANLIB)" "$(<)"
|
|
||||||
}
|
|
||||||
|
|
|
@ -1,17 +0,0 @@
|
||||||
--- boost_1_64_0/tools/build/src/tools/darwin.jam
|
|
||||||
+++ boost_1_64_0/tools/build/src/tools/darwin.jam
|
|
||||||
@@ -138,10 +138,10 @@ rule init ( version ? : command * : options * : requirement * )
|
|
||||||
common.handle-options darwin : $(condition) : $(command) : $(options) ;
|
|
||||||
|
|
||||||
# - GCC 4.0 and higher in Darwin does not have -fcoalesce-templates.
|
|
||||||
- if $(real-version) < "4.0.0"
|
|
||||||
- {
|
|
||||||
- flags darwin.compile.c++ OPTIONS $(condition) : -fcoalesce-templates ;
|
|
||||||
- }
|
|
||||||
+ #if $(real-version) < "4.0.0"
|
|
||||||
+ #{
|
|
||||||
+ # flags darwin.compile.c++ OPTIONS $(condition) : -fcoalesce-templates ;
|
|
||||||
+ #}
|
|
||||||
# - GCC 4.2 and higher in Darwin does not have -Wno-long-double.
|
|
||||||
if $(real-version) < "4.2.0"
|
|
||||||
{
|
|
|
@ -16,6 +16,7 @@ SET(TREZOR_DEBUG @build_tests@)
|
||||||
|
|
||||||
# where is the target environment
|
# where is the target environment
|
||||||
SET(CMAKE_FIND_ROOT_PATH @prefix@)
|
SET(CMAKE_FIND_ROOT_PATH @prefix@)
|
||||||
|
SET(LIB_DIR @prefix@/lib)
|
||||||
|
|
||||||
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
|
if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
|
||||||
# WMF libs
|
# WMF libs
|
||||||
|
@ -69,7 +70,10 @@ SET(BOOST_LIBRARYDIR @prefix@/lib)
|
||||||
SET(Boost_IGNORE_SYSTEM_PATHS_DEFAULT OFF)
|
SET(Boost_IGNORE_SYSTEM_PATHS_DEFAULT OFF)
|
||||||
SET(Boost_NO_SYSTEM_PATHS ON)
|
SET(Boost_NO_SYSTEM_PATHS ON)
|
||||||
SET(Boost_USE_STATIC_LIBS ON)
|
SET(Boost_USE_STATIC_LIBS ON)
|
||||||
|
|
||||||
|
if (NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
|
||||||
SET(Boost_USE_STATIC_RUNTIME ON)
|
SET(Boost_USE_STATIC_RUNTIME ON)
|
||||||
|
endif()
|
||||||
|
|
||||||
SET(OPENSSL_ROOT_DIR @prefix@)
|
SET(OPENSSL_ROOT_DIR @prefix@)
|
||||||
SET(ARCHITECTURE @arch@)
|
SET(ARCHITECTURE @arch@)
|
||||||
|
|
|
@ -233,6 +233,10 @@ if (WITH_SCANNER)
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if (DEPENDS)
|
||||||
|
target_link_directories(feather PRIVATE "${LIB_DIR}")
|
||||||
|
endif()
|
||||||
|
|
||||||
target_link_libraries(feather
|
target_link_libraries(feather
|
||||||
wallet_merged
|
wallet_merged
|
||||||
${LMDB_LIBRARY}
|
${LMDB_LIBRARY}
|
||||||
|
|
Loading…
Reference in a new issue