gitea-mirror/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2026-07-30 23:50:24 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add Miniupnp submodule

Browse Source 
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
This commit is contained in:
TheCharlatan
2018-09-10 22:05:37 +02:00
parent 5f7da005a3
commit cfb3046222
6 changed files with 21 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
contrib/depends/packages/cppzmq.mk
-12
View File
@@ -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
contrib/depends/packages/packages.mk
+2 -6
View File
@@ -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
contrib/depends/packages/pcsc-lite.mk
+1 -1
View File
@@ -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
contrib/depends/toolchain.cmake.in
+3 -4
View File
@@ -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)