depends: hidapi: build with cmake

diff --git a/contrib/depends/funcs.mk b/contrib/depends/funcs.mk
index e39280fd45aaf2d24a1ba2b07d339fdbbd95e912..b453db7bc71665d55d6be5b68710927d441496f1 100644 (file)
--- a/contrib/depends/funcs.mk
+++ b/contrib/depends/funcs.mk
@@ -191,7 +191,7 @@ $(1)_cmake=env CC="$$($(1)_cc)" \
                CXX="$$($(1)_cxx)" \
                CXXFLAGS="$$($(1)_cppflags) $$($(1)_cxxflags)" \
                LDFLAGS="$$($(1)_ldflags)" \
-             cmake -DCMAKE_INSTALL_PREFIX:PATH="$$($($(1)_type)_prefix)" $$($(1)_cmake_opts)
+             cmake -DCMAKE_INSTALL_PREFIX:PATH="$$($($(1)_type)_prefix)" $$($(1)_config_opts)
 ifeq ($($(1)_type),build)
 $(1)_cmake += -DCMAKE_INSTALL_RPATH:PATH="$$($($(1)_type)_prefix)/lib"
 else

diff --git a/contrib/depends/packages/hidapi.mk b/contrib/depends/packages/hidapi.mk
index 958e265cad33dd515e9a5e668b8cb9c005e84cc9..54860abd3f4cb4e4d19281b3f9c872d3dd234d9e 100644 (file)
--- a/contrib/depends/packages/hidapi.mk
+++ b/contrib/depends/packages/hidapi.mk
@@ -6,18 +6,11 @@ $(package)_sha256_hash=a5714234abe6e1f53647dd8cba7d69f65f71c558b7896ed218864ffcf
 $(package)_linux_dependencies=libusb eudev
 
 define $(package)_set_vars
-$(package)_config_opts=--enable-static --disable-shared
-$(package)_config_opts+=--prefix=$(host_prefix)
-$(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
-$(package)_config_opts_linux+=--with-pic
+  $(package)_config_opts+=-DBUILD_SHARED_LIBS=OFF
 endef
 
 define $(package)_config_cmds
-  ./bootstrap &&\
-  $($(package)_autoconf) $($(package)_config_opts)
+  $($(package)_cmake) .
 endef
 
 define $(package)_build_cmds
@@ -27,7 +20,3 @@ endef
 define $(package)_stage_cmds
   $(MAKE) DESTDIR=$($(package)_staging_dir) install
 endef
-
-define $(package)_postprocess_cmds
-  rm lib/*.la
-endef