Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: monero-project/monero
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: ad99a35d6b3a
Choose a base ref
...
head repository: monero-project/monero
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 890824dbc024
Choose a head ref
  • 2 commits
  • 8 files changed
  • 2 contributors

Commits on Oct 7, 2018

  1. Consolidate HID depends makefiles into single recipe 

    Make sure all required dependencies are linked statically, by only
providing the static libraries.
    @TheCharlatan
    TheCharlatan committed Oct 7, 2018
    Copy the full SHA
    21a624a View commit details

  2. Merge pull request #4510 

    21a624a Consolidate HID depends makefiles into single recipe (TheCharlatan)
    @fluffypony
    fluffypony committed Oct 7, 2018
    Copy the full SHA
    890824d View commit details
2 changes: 1 addition & 1 deletion contrib/depends/packages/eudev.mk
View file
Original file line number Diff line number Diff line change
@@ -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
23 changes: 0 additions & 23 deletions contrib/depends/packages/hidapi-darwin.mk
View file

This file was deleted.

28 changes: 0 additions & 28 deletions contrib/depends/packages/hidapi-linux.mk
View file

This file was deleted.

8 changes: 7 additions & 1 deletion contrib/depends/packages/hidapi.mk
View file
Original file line number Diff line number Diff line change
@@ -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
7 changes: 3 additions & 4 deletions contrib/depends/packages/packages.mk
View file
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion contrib/depends/packages/sodium-darwin.mk
View file
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion contrib/depends/packages/sodium.mk
View file
Original file line number Diff line number Diff line change
@@ -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

3 changes: 3 additions & 0 deletions contrib/depends/toolchain.cmake.in
View file
Original file line number Diff line number Diff line change
@@ -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)