Skip to content

Commit

Permalink
Add hidapi to depends
Browse files Browse the repository at this point in the history
Clang needs to get its cctools path passed directly for the hid build to
succeed.
Make gperf a permanent external dependency.
Remove pcsc from depends.
  • Loading branch information
TheCharlatan committed Sep 25, 2018
1 parent d2f9a4c commit 5c234cb
Show file tree
Hide file tree
Showing 8 changed files with 138 additions and 32 deletions.
8 changes: 4 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ env:
- DOCKER_PACKAGES="build-essential libtool cmake autotools-dev automake pkg-config bsdmainutils curl git ca-certificates ccache"
matrix:
# ARM v7
- HOST=arm-linux-gnueabihf PACKAGES="g++-arm-linux-gnueabihf"
- HOST=arm-linux-gnueabihf PACKAGES="gperf g++-arm-linux-gnueabihf"
# ARM v8
- HOST=aarch64-linux-gnu PACKAGES="g++-aarch64-linux-gnu"
- HOST=aarch64-linux-gnu PACKAGES="gperf g++-aarch64-linux-gnu"
# i686 Linux
- HOST=i686-pc-linux-gnu PACKAGES="cmake g++-multilib bc python3-zmq" RUN_TESTS=true
- HOST=i686-pc-linux-gnu PACKAGES="gperf cmake g++-multilib bc python3-zmq" RUN_TESTS=true
# Win64
- HOST=x86_64-w64-mingw32 PACKAGES="cmake python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64 bc" RUN_TESTS=true
# x86_64 Linux
- HOST=x86_64-unknown-linux-gnu PACKAGES="cmake python3-zmq protobuf-compiler libdbus-1-dev libharfbuzz-dev libprotobuf-dev" RUN_TESTS=true
- HOST=x86_64-unknown-linux-gnu PACKAGES="gperf cmake python3-zmq protobuf-compiler libdbus-1-dev libharfbuzz-dev libprotobuf-dev" RUN_TESTS=true
# Cross-Mac
- HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev python3-setuptools-git" OSX_SDK=10.11

Expand Down
25 changes: 25 additions & 0 deletions contrib/depends/packages/eudev.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
package=eudev
$(package)_version=v3.2.6
$(package)_download_path=https://github.com/gentoo/eudev/archive/
$(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
endef

define $(package)_config_cmds
$($(package)_autoconf)
endef

define $(package)_build_cmd
$(MAKE)
endef

define $(package)_preprocess_cmds
cd $($(package)_build_subdir); autoreconf -f -i
endef

define $(package)_stage_cmds
$(MAKE) DESTDIR=$($(package)_staging_dir) install
endef
23 changes: 23 additions & 0 deletions contrib/depends/packages/hidapi-darwin.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
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"
endef

define $(package)_build_cmds
$(MAKE)
endef

define $(package)_stage_cmds
$(MAKE) DESTDIR=$($(package)_staging_dir) install
endef
28 changes: 28 additions & 0 deletions contrib/depends/packages/hidapi-linux.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
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
23 changes: 23 additions & 0 deletions contrib/depends/packages/hidapi.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package=hidapi
$(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

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)
endef

define $(package)_build_cmds
$(MAKE)
endef

define $(package)_stage_cmds
$(MAKE) DESTDIR=$($(package)_staging_dir) install
endef
31 changes: 31 additions & 0 deletions contrib/depends/packages/libusb.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package=libusb
$(package)_version=1.0.9
$(package)_download_path=http://sourceforge.net/projects/libusb/files/libusb-1.0/libusb-1.0.9/
$(package)_file_name=$(package)-$($(package)_version).tar.bz2
$(package)_sha256_hash=e920eedc2d06b09606611c99ec7304413c6784cba6e33928e78243d323195f9b

define $(package)_preprocess_cmds
autoreconf -i
endef

define $(package)_set_vars
$(package)_config_opts=--disable-shared
$(package)_config_opts_linux=--with-pic
endef

define $(package)_config_cmds
cp -f $(BASEDIR)/config.guess config.guess &&\
cp -f $(BASEDIR)/config.sub config.sub &&\
$($(package)_autoconf)
endef

define $(package)_build_cmd
$(MAKE)
endef

define $(package)_stage_cmds
$(MAKE) DESTDIR=$($(package)_staging_dir) install
endef

define $(package)_postprocess_cmds cp -f lib/libusb-1.0.a lib/libusb.a
endef
6 changes: 4 additions & 2 deletions contrib/depends/packages/packages.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,18 @@ native_packages := native_ccache
wallet_packages=bdb

darwin_native_packages = native_biplist native_ds_store native_mac_alias
darwin_packages += sodium-darwin
darwin_packages += sodium-darwin hidapi-darwin

linux_packages = eudev libusb hidapi-linux

ifeq ($(host_os),linux)
packages += pcsc-lite
packages += unwind
packages += sodium
endif
ifeq ($(host_os),mingw32)
packages += icu4c
packages += sodium
packages += hidapi
endif

ifneq ($(build_os),darwin)
Expand Down
26 changes: 0 additions & 26 deletions contrib/depends/packages/pcsc-lite.mk

This file was deleted.

0 comments on commit 5c234cb

Please sign in to comment.