Merge pull request #4510

21a624af Consolidate HID depends makefiles into single recipe (TheCharlatan)

8 files changed, 16 insertions, 59 deletions

diff --git a/contrib/depends/packages/eudev.mk b/contrib/depends/packages/eudev.mk
index 08752909f..e754c0f20 100644
--- a/contrib/depends/packages/eudev.mk
+++ b/contrib/depends/packages/eudev.mk
@@ -5,7 +5,7 @@ $(package)_file_name=$($(package)_version).tar.gz
 $(package)_sha256_hash=a96ecb8637667897b8bd4dee4c22c7c5f08b327be45186e912ce6bc768385852
 
 define $(package)_set_vars
-  $(package)_config_opts=--disable-gudev --disable-introspection --disable-hwdb --disable-manpages
+  $(package)_config_opts=--disable-gudev --disable-introspection --disable-hwdb --disable-manpages --disable-shared
 endef
 
 define $(package)_config_cmds
diff --git a/contrib/depends/packages/hidapi-darwin.mk b/contrib/depends/packages/hidapi-darwin.mk
deleted file mode 100644
index 014aba578..000000000
--- a/contrib/depends/packages/hidapi-darwin.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-package=hidapi-darwin
-$(package)_version=0.8.0-rc1
-$(package)_download_path=https://github.com/signal11/hidapi/archive
-$(package)_file_name=hidapi-$($(package)_version).tar.gz
-$(package)_sha256_hash=3c147200bf48a04c1e927cd81589c5ddceff61e6dac137a605f6ac9793f4af61
-
-define $(package)_set_vars
-$(package)_config_opts=--enable-static
-$(package)_config_opts+=--prefix=$(host_prefix)
-endef
-
-define $(package)_config_cmds
-  ./bootstrap &&\
-  $($(package)_autoconf) $($(package)_config_opts) RANLIB="$(host_prefix)/native/bin/x86_64-apple-darwin11-ranlib" AR="$(host_prefix)/native/bin/x86_64-apple-darwin11-ar" CC="$(host_prefix)/native/bin/$($(package)_cc)"
-endef
-
-define $(package)_build_cmds
-  $(MAKE)
-endef
-
-define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install
-endef
diff --git a/contrib/depends/packages/hidapi-linux.mk b/contrib/depends/packages/hidapi-linux.mk
deleted file mode 100644
index b2a499915..000000000
--- a/contrib/depends/packages/hidapi-linux.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-package=hidapi-linux
-$(package)_version=0.8.0-rc1
-$(package)_download_path=https://github.com/signal11/hidapi/archive
-$(package)_file_name=hidapi-$($(package)_version).tar.gz
-$(package)_sha256_hash=3c147200bf48a04c1e927cd81589c5ddceff61e6dac137a605f6ac9793f4af61
-$(package)_dependencies=libusb eudev
-
-define $(package)_set_vars
-$(package)_config_opts=--enable-static
-$(package)_config_opts+=--prefix=$(host_prefix)
-$(package)_config_opts+=libudev_LIBS="-L$(host_prefix)/lib -ludev"
-$(package)_config_opts+=libudev_CFLAGS=-I$(host_prefix)/include
-$(package)_config_opts+=libusb_LIBS="-L$(host_prefix)/lib -lusb-1.0"
-$(package)_config_opts+=libusb_CFLAGS=-I$(host_prefix)/include/libusb-1.0
-endef
-
-define $(package)_config_cmds
-  ./bootstrap &&\
-  $($(package)_autoconf) $($(package)_config_opts)
-endef
-
-define $(package)_build_cmds
-  $(MAKE)
-endef
-
-define $(package)_stage_cmds
-  $(MAKE) DESTDIR=$($(package)_staging_dir) install
-endef
diff --git a/contrib/depends/packages/hidapi.mk b/contrib/depends/packages/hidapi.mk
index b6b228643..d4dd80e22 100644
--- a/contrib/depends/packages/hidapi.mk
+++ b/contrib/depends/packages/hidapi.mk
@@ -3,10 +3,16 @@ $(package)_version=0.8.0-rc1
 $(package)_download_path=https://github.com/signal11/hidapi/archive
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
 $(package)_sha256_hash=3c147200bf48a04c1e927cd81589c5ddceff61e6dac137a605f6ac9793f4af61
+$(package)_linux_dependencies=libusb eudev
 
 define $(package)_set_vars
-$(package)_config_opts=--enable-static
+$(package)_config_opts=--enable-static --disable-shared
 $(package)_config_opts+=--prefix=$(host_prefix)
+$(package)_config_opts_darwin+=RANLIB="$(host_prefix)/native/bin/x86_64-apple-darwin11-ranlib" AR="$(host_prefix)/native/bin/x86_64-apple-darwin11-ar" CC="$(host_prefix)/native/bin/$($(package)_cc)"
+$(package)_config_opts_linux+=libudev_LIBS="-L$(host_prefix)/lib -ludev"
+$(package)_config_opts_linux+=libudev_CFLAGS=-I$(host_prefix)/include
+$(package)_config_opts_linux+=libusb_LIBS="-L$(host_prefix)/lib -lusb-1.0"
+$(package)_config_opts_linux+=libusb_CFLAGS=-I$(host_prefix)/include/libusb-1.0
 endef
 
 define $(package)_config_cmds
diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk
index 9bfbff7d9..f814c14d6 100644
--- a/contrib/depends/packages/packages.mk
+++ b/contrib/depends/packages/packages.mk
@@ -1,12 +1,12 @@
-packages:=boost openssl libevent zeromq cppzmq zlib expat ldns cppzmq readline libiconv qt
+packages:=boost openssl libevent zeromq cppzmq zlib expat ldns cppzmq readline libiconv qt hidapi
 native_packages := native_ccache
 
 wallet_packages=bdb
 
 darwin_native_packages = native_biplist native_ds_store native_mac_alias
-darwin_packages = sodium-darwin hidapi-darwin
+darwin_packages = sodium-darwin
 
-linux_packages = eudev libusb hidapi-linux
+linux_packages = eudev libusb
 
 ifeq ($(host_os),linux)
 packages += unwind
@@ -15,7 +15,6 @@ endif
 ifeq ($(host_os),mingw32)
 packages += icu4c
 packages += sodium
-packages += hidapi
 endif
 
 ifneq ($(build_os),darwin)
diff --git a/contrib/depends/packages/sodium-darwin.mk b/contrib/depends/packages/sodium-darwin.mk
index 59c6d1ec6..d8e3de352 100644
--- a/contrib/depends/packages/sodium-darwin.mk
+++ b/contrib/depends/packages/sodium-darwin.mk
@@ -6,7 +6,7 @@ $(package)_sha256_hash=fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe
 
 define $(package)_set_vars
 $(package)_build_opts_darwin=OS=Darwin LIBTOOL="$($(package)_libtool)"
-$(package)_config_opts=--enable-static
+$(package)_config_opts=--enable-static --disable-shared
 $(package)_config_opts+=--prefix=$(host_prefix)
 endef
 
diff --git a/contrib/depends/packages/sodium.mk b/contrib/depends/packages/sodium.mk
index 0e6668062..c38121bf7 100644
--- a/contrib/depends/packages/sodium.mk
+++ b/contrib/depends/packages/sodium.mk
@@ -5,7 +5,7 @@ $(package)_file_name=libsodium-$($(package)_version).tar.gz
 $(package)_sha256_hash=fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4
 
 define $(package)_set_vars
-$(package)_config_opts=--enable-static
+$(package)_config_opts=--enable-static --disable-shared
 $(package)_config_opts+=--prefix=$(host_prefix)
 endef
 
diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in
index bde7497b3..f8548a724 100644
--- a/contrib/depends/toolchain.cmake.in
+++ b/contrib/depends/toolchain.cmake.in
@@ -18,6 +18,9 @@ SET(LIBUNWIND_INCLUDE_DIR @prefix@/include)
 SET(LIBUNWIND_LIBRARIES @prefix@/lib/libunwind.a)
 SET(LIBUNWIND_LIBRARY_DIRS @prefix@/lib)
 
+SET(LIBUSB-1.0_LIBRARY @prefix@/lib/libusb-1.0.a)
+SET(LIBUDEV_LIBRARY @prefix@/lib/libudev.a)
+
 SET(ZMQ_INCLUDE_PATH @prefix@/include)
 SET(ZMQ_LIB @prefix@/lib/libzmq.a)