forked from such-gitea/wownero
fix: indent/space breaking build
Some checks failed
Build Wownero Core (Clean / Boost 1.90) / build-all (aarch64-apple-darwin11) (push) Failing after 9m36s
Build Wownero Core (Clean / Boost 1.90) / build-all (aarch64-linux-gnu) (push) Has been cancelled
Build Wownero Core (Clean / Boost 1.90) / build-all (riscv64-linux-gnu) (push) Has been cancelled
Build Wownero Core (Clean / Boost 1.90) / build-all (x86_64-apple-darwin11) (push) Has been cancelled
Build Wownero Core (Clean / Boost 1.90) / build-all (x86_64-linux-gnu) (push) Has been cancelled
Build Wownero Core (Clean / Boost 1.90) / build-all (x86_64-w64-mingw32) (push) Has been cancelled
Build Wownero Core (Clean / Boost 1.90) / release (push) Has been cancelled
Some checks failed
Build Wownero Core (Clean / Boost 1.90) / build-all (aarch64-apple-darwin11) (push) Failing after 9m36s
Build Wownero Core (Clean / Boost 1.90) / build-all (aarch64-linux-gnu) (push) Has been cancelled
Build Wownero Core (Clean / Boost 1.90) / build-all (riscv64-linux-gnu) (push) Has been cancelled
Build Wownero Core (Clean / Boost 1.90) / build-all (x86_64-apple-darwin11) (push) Has been cancelled
Build Wownero Core (Clean / Boost 1.90) / build-all (x86_64-linux-gnu) (push) Has been cancelled
Build Wownero Core (Clean / Boost 1.90) / build-all (x86_64-w64-mingw32) (push) Has been cancelled
Build Wownero Core (Clean / Boost 1.90) / release (push) Has been cancelled
This commit is contained in:
@@ -5,51 +5,37 @@ $(package)_file_name=$(package)_$(subst .,_,$($(package)_version)).tar.bz2
|
||||
$(package)_sha256_hash=49551aff3b22cbc5c5a9ed3dbc92f0e23ea50a0f7325b0d198b705e8ee3fc305
|
||||
$(package)_dependencies=libiconv
|
||||
|
||||
# NOTE: We removed the old patches (fix_aroptions, fix_arm_arch)
|
||||
# because Boost 1.90 fixed those bugs upstream.
|
||||
|
||||
define $(package)_set_vars
|
||||
$(package)_config_opts_release=variant=release
|
||||
$(package)_config_opts_debug=variant=debug
|
||||
$(package)_config_opts+=--layout=tagged --user-config=user-config.jam
|
||||
$(package)_config_opts+=threading=multi link=static -sNO_BZIP2=1 -sNO_ZLIB=1
|
||||
|
||||
# CRITICAL CHANGE: We force runtime-link=static for Linux to fix your linker errors
|
||||
$(package)_config_opts_linux=threadapi=pthread runtime-link=static
|
||||
|
||||
$(package)_config_opts_android=threadapi=pthread runtime-link=static target-os=android
|
||||
$(package)_config_opts_darwin=--toolset=darwin runtime-link=shared address-model=64
|
||||
$(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
|
||||
|
||||
# Toolset definitions (Keep these! They tell Boost which compiler to use)
|
||||
$(package)_toolset_$(host_os)=gcc
|
||||
$(package)_archiver_$(host_os)=$($(package)_ar)
|
||||
$(package)_toolset_darwin=darwin
|
||||
$(package)_archiver_darwin=$($(package)_libtool)
|
||||
|
||||
# CRITICAL UPDATE: Added context, coroutine (for LWS) and updated to C++17 (for Monero v0.18)
|
||||
$(package)_config_libraries=chrono,filesystem,program_options,system,thread,test,date_time,regex,serialization,locale,context,coroutine
|
||||
$(package)_cxxflags=-std=c++17 -fPIC
|
||||
$(package)_config_opts_release=variant=release
|
||||
$(package)_config_opts_debug=variant=debug
|
||||
$(package)_config_opts+=--layout=tagged --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=static
|
||||
$(package)_config_opts_darwin=target-os=darwin address-model=64 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)_toolset_$(host_os)=gcc
|
||||
$(package)_archiver_$(host_os)=$($(package)_ar)
|
||||
$(package)_toolset_darwin=darwin
|
||||
$(package)_archiver_darwin=$($(package)_libtool)
|
||||
$(package)_config_libraries=chrono,filesystem,program_options,system,thread,test,date_time,regex,serialization,locale,context,coroutine
|
||||
$(package)_cxxflags=-std=c++17 -fPIC
|
||||
endef
|
||||
|
||||
define $(package)_preprocess_cmds
|
||||
# This block explicitly creates the config file so Boost uses the cross-compiler variables
|
||||
# provided by the 'depends' system (CC, CXX, AR, etc.)
|
||||
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
|
||||
|
||||
define $(package)_config_cmds
|
||||
./bootstrap.sh --without-icu --with-libraries=$(boost_config_libraries)
|
||||
./bootstrap.sh --without-icu --with-libraries=$(boost_config_libraries)
|
||||
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) 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) install
|
||||
endef
|
||||
Reference in New Issue
Block a user