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
This commit is contained in:
TheCharlatan 2018-04-25 18:19:05 +02:00 committed by wowario
parent dfe5f94145
commit 427e74cb46
No known key found for this signature in database
GPG key ID: 24DCBE762DE9C111
6 changed files with 21 additions and 55 deletions

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

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

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