diff options
| author | TheCharlatan <seb.kung@gmail.com> | 2018-04-25 18:19:05 +0200 |
|---|---|---|
| committer | TheCharlatan <seb.kung@gmail.com> | 2018-09-10 22:05:37 +0200 |
| commit | cfb3046222ba2bf42732bb9806906a78bc11a49c (patch) | |
| tree | 018e4e74f42769886319a66b6d047e3ffbaab1be /contrib | |
| parent | Unbound is now a submodule. Adapt depends for this. (diff) | |
| download | monero-cfb3046222ba2bf42732bb9806906a78bc11a49c.tar.xz | |
Add Miniupnp submodule
Drop miniupnp and unbound depends builds. Make sure that build variables are propageted properly to unbound and miniupnp.
Rebase to after the v0.12 release
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/depends/packages/cppzmq.mk | 12 | ||||
| -rw-r--r-- | contrib/depends/packages/packages.mk | 8 | ||||
| -rw-r--r-- | contrib/depends/packages/pcsc-lite.mk | 2 | ||||
| -rw-r--r-- | contrib/depends/toolchain.cmake.in | 7 |
4 files changed, 6 insertions, 23 deletions
diff --git a/contrib/depends/packages/cppzmq.mk b/contrib/depends/packages/cppzmq.mk index 9ff5a5ab0..6c0faf084 100644 --- a/contrib/depends/packages/cppzmq.mk +++ b/contrib/depends/packages/cppzmq.mk @@ -5,19 +5,7 @@ $(package)_file_name=v$($(package)_version).tar.gz $(package)_sha256_hash=3e6b57bf49115f4ae893b1ff7848ead7267013087dc7be1ab27636a97144d373 $(package)_dependencies=zeromq -define $(package)_config_cmds - echo $(build_pefix) &&\ - cmake -DCMAKE_INSTALL_PREFIX=$(build_prefix)/../ -DCMAKE_PREFIX_PATH=$(build_prefix)/../include -DZeroMQ_STATIC_LIBRARY=$(build_prefix)/lib -DPC_LIBZMQ_LIBDIR=$(build_prefix)/lib -DPC_LIBZMQ_LIBRARY_DIRS=$(build_prefix)/lib CMakeLists.txt -endef - -define $(package)_build_cmds - $(MAKE) -endef - define $(package)_stage_cmds - $(MAKE) DESTDIR=$($(package)_staging_dir) &&\ - echo $(host_prefix)/include/ &&\ - echo $($(package)_staging_prefix_dir) &&\ mkdir $($(package)_staging_prefix_dir)/include &&\ cp zmq.hpp $($(package)_staging_prefix_dir)/include endef diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk index af92191bb..604b5017f 100644 --- a/contrib/depends/packages/packages.mk +++ b/contrib/depends/packages/packages.mk @@ -1,18 +1,14 @@ -packages:=boost openssl libevent zeromq cppzmq zlib expat ldns unbound cppzmq readline libiconv +packages:=boost openssl libevent zeromq cppzmq zlib expat ldns cppzmq readline libiconv native_packages := native_ccache wallet_packages=bdb -upnp_packages=miniupnpc - darwin_native_packages = native_biplist native_ds_store native_mac_alias ifeq ($(host_os),linux) +packages += pcsc-lite packages += unwind endif -ifeq ($(host_os),darwin11) -package += unwind -endif ifeq ($(host_os),mingw32) packages += icu4c endif diff --git a/contrib/depends/packages/pcsc-lite.mk b/contrib/depends/packages/pcsc-lite.mk index a24442eb9..f568db773 100644 --- a/contrib/depends/packages/pcsc-lite.mk +++ b/contrib/depends/packages/pcsc-lite.mk @@ -8,7 +8,7 @@ define $(package)_set_vars $(package)_build_opts=CC="$($(package)_cc)" $(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)" $(package)_config_opts=--prefix=$(host_prefix) - $(package)_config_opts_release=--disable-debug-mode --disable-libsystemd --enable-static + $(package)_config_opts_release=--disable-debug-mode --disable-libsystemd --disable-libudev --enable-static --disable-shared --disable-libusb $(package)_build_opts=CFLAGS="$($(package)_cflags) $($(package)_cppflags) -fPIC" endef diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index f76d7d1ea..6c708f439 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -17,9 +17,9 @@ SET(LIBUNWIND_INCLUDE_DIR @prefix@/include) SET(LIBUNWIND_LIBRARIES @prefix@/lib/libunwind.a) SET(LIBUNWIND_LIBRARY_DIRS @prefix@/lib) -SET(UNBOUND_INCLUDE_DIR @prefix@/include) -SET(UNBOUND_LIBRARIES @prefix@/lib) -SET(UNBOUND_LIBRARY @prefix@/lib/libunbound.a) +#SET(UNBOUND_INCLUDE_DIR @prefix@/include) +#SET(UNBOUND_LIBRARIES @prefix@/lib) +#SET(UNBOUND_LIBRARY @prefix@/lib/libunbound.a) SET(ZMQ_INCLUDE_PATH @prefix@/include) SET(ZMQ_LIB @prefix@/lib/libzmq.a) @@ -28,7 +28,6 @@ SET(BOOST_IGNORE_SYSTEM_PATHS_DEFAULT ON) SET(BOOST_IGNORE_SYSTEM_PATH ON) SET(BOOST_ROOT @prefix@) SET(BOOST_LIBRARYDIR @prefix@/lib) -SET(Boost_COMPILER "-clang") SET(BOOST_IGNORE_SYSTEM_PATHS_DEFAULT OFF) SET(Boost_NO_SYSTEM_PATHS TRUE) SET(Boost_USE_STATIC_LIBS TRUE) |