diff options
| author | TheCharlatan <seb.kung@gmail.com> | 2018-03-20 00:33:49 +0100 |
|---|---|---|
| committer | TheCharlatan <seb.kung@gmail.com> | 2018-09-10 22:05:36 +0200 |
| commit | 56b6e41ea7b7c17b513c24797d234e5cf9df8fa2 (patch) | |
| tree | 7a319632b4178438e2578b22c37ad973e83994ad /contrib/depends/packages | |
| parent | Disable stack unwinding for mingw32 depends build. (diff) | |
| download | monero-56b6e41ea7b7c17b513c24797d234e5cf9df8fa2.tar.xz | |
Add support for apple and arm building
Add pcsc-lite to linux builds
Fixup windows icu4c linking with depends, the static libraries have an 's' appended to them
Compiling depends arm-linux-gnueabihf will allow you to compile armv6zk monero binaries
Diffstat (limited to 'contrib/depends/packages')
| -rw-r--r-- | contrib/depends/packages/boost.mk | 14 | ||||
| -rw-r--r-- | contrib/depends/packages/packages.mk | 5 | ||||
| -rw-r--r-- | contrib/depends/packages/unwind.mk | 4 |
3 files changed, 14 insertions, 9 deletions
diff --git a/contrib/depends/packages/boost.mk b/contrib/depends/packages/boost.mk index 9d3dda74a..89db5a415 100644 --- a/contrib/depends/packages/boost.mk +++ b/contrib/depends/packages/boost.mk @@ -1,8 +1,8 @@ -package=boost -$(package)_version=1_58_0 -$(package)_download_path=https://sourceforge.net/projects/boost/files/boost/1.58.0 -$(package)_file_name=$(package)_$($(package)_version).tar.gz -$(package)_sha256_hash=a004d9b3fa95e956383693b86fce1b68805a6f71c2e68944fa813de0fb8c8102 +package=boost +$(package)_version=1_64_0 +$(package)_download_path=https://dl.bintray.com/boostorg/release/1.64.0/source/ +$(package)_file_name=$(package)_$($(package)_version).tar.bz2 +$(package)_sha256_hash=7bcc5caace97baa948931d712ea5f37038dbb1c5d89b43ad4def4ed7cb683332 define $(package)_set_vars $(package)_config_opts_release=variant=release @@ -19,13 +19,13 @@ $(package)_toolset_$(host_os)=gcc $(package)_archiver_$(host_os)=$($(package)_ar) $(package)_toolset_darwin=darwin $(package)_archiver_darwin=$($(package)_libtool) -$(package)_config_libraries=system,filesystem,thread,date_time,chrono,regex,serialization,program_options,locale +$(package)_config_libraries=chrono,filesystem,program_options,system,thread,test,date_time,regex,serialization,locale $(package)_cxxflags=-std=c++11 -fvisibility=hidden $(package)_cxxflags_linux=-fPIC endef define $(package)_preprocess_cmds - echo "using $(boost_toolset_$(host_os)) : : $($(package)_cxx) : <cxxflags>\"$($(package)_cxxflags) $($(package)_cppflags)\" <linkflags>\"$($(package)_ldflags)\" <archiver>\"$(boost_archiver_$(host_os))\" <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))\" <striper>\"$(host_STR IP)\" <ranlib>\"$(host_RANLIB)\" <rc>\"$(host_WINDRES)\" : ;" > user-config.jam endef define $(package)_config_cmds diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk index 1aca06096..af92191bb 100644 --- a/contrib/depends/packages/packages.mk +++ b/contrib/depends/packages/packages.mk @@ -1,4 +1,4 @@ -packages:=boost openssl libevent zeromq cppzmq zlib expat ldns unbound cppzmq readline libiconv icu4c +packages:=boost openssl libevent zeromq cppzmq zlib expat ldns unbound cppzmq readline libiconv native_packages := native_ccache wallet_packages=bdb @@ -13,6 +13,9 @@ endif ifeq ($(host_os),darwin11) package += unwind endif +ifeq ($(host_os),mingw32) +packages += icu4c +endif ifneq ($(build_os),darwin) darwin_native_packages += native_cctools native_cdrkit native_libdmg-hfsplus diff --git a/contrib/depends/packages/unwind.mk b/contrib/depends/packages/unwind.mk index 06e142115..e1bcb35b2 100644 --- a/contrib/depends/packages/unwind.mk +++ b/contrib/depends/packages/unwind.mk @@ -5,7 +5,9 @@ $(package)_file_name=lib$(package)-$($(package)_version).tar.gz $(package)_sha256_hash=1de38ffbdc88bd694d10081865871cd2bfbb02ad8ef9e1606aee18d65532b992 define $(package)_config_cmds - $($(package)_autoconf) --disable-shared --enable-static + cp -f $(BASEDIR)/config.guess config/config.guess &&\ + cp -f $(BASEDIR)/config.sub config/config.sub &&\ + $($(package)_autoconf) --disable-shared --enable-static endef define $(package)_build_cmds |