rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-23 10:37:37 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4448

Browse Source 
6a781408 Make depends use self built clang for darwin (TheCharlatan)
This commit is contained in:
Riccardo Spagni 2018-09-29 22:14:56 +02:00
parent 5bcead236f
commit 8e98ed8c71
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -883,11 +883,15 @@ list(APPEND EXTRA_LIBRARIES ${CMAKE_DL_LIBS})
if (HIDAPI_FOUND) if (HIDAPI_FOUND)
if (APPLE) if (APPLE)
if(DEPENDS)
list(APPEND EXTRA_LIBRARIES "-framework Foundation -framework IOKit")
else()
find_library(COREFOUNDATION CoreFoundation) find_library(COREFOUNDATION CoreFoundation)
find_library(IOKIT IOKit) find_library(IOKIT IOKit)
list(APPEND EXTRA_LIBRARIES ${IOKIT}) list(APPEND EXTRA_LIBRARIES ${IOKIT})
list(APPEND EXTRA_LIBRARIES ${COREFOUNDATION}) list(APPEND EXTRA_LIBRARIES ${COREFOUNDATION})
endif() endif()
endif()
if (WIN32) if (WIN32)
list(APPEND EXTRA_LIBRARIES setupapi) list(APPEND EXTRA_LIBRARIES setupapi)
endif() endif()

2
contrib/depends/packages/hidapi-darwin.mk
View File

@ -11,7 +11,7 @@ endef
define $(package)_config_cmds define $(package)_config_cmds
./bootstrap &&\ ./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" $($(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 endef
define $(package)_build_cmds define $(package)_build_cmds

2
contrib/depends/packages/packages.mk
View File

@ -4,7 +4,7 @@ native_packages := native_ccache
wallet_packages=bdb wallet_packages=bdb
darwin_native_packages = native_biplist native_ds_store native_mac_alias darwin_native_packages = native_biplist native_ds_store native_mac_alias
darwin_packages += sodium-darwin hidapi-darwin darwin_packages = sodium-darwin hidapi-darwin
linux_packages = eudev libusb hidapi-linux linux_packages = eudev libusb hidapi-linux

3
contrib/depends/packages/sodium-darwin.mk
View File

@ -5,13 +5,14 @@ $(package)_file_name=libsodium-$($(package)_version).tar.gz
$(package)_sha256_hash=fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4 $(package)_sha256_hash=fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4
define $(package)_set_vars define $(package)_set_vars
$(package)_build_opts_darwin=OS=Darwin LIBTOOL="$($(package)_libtool)"
$(package)_config_opts=--enable-static $(package)_config_opts=--enable-static
$(package)_config_opts+=--prefix=$(host_prefix) $(package)_config_opts+=--prefix=$(host_prefix)
endef endef
define $(package)_config_cmds define $(package)_config_cmds
./autogen.sh &&\ ./autogen.sh &&\
$($(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" $($(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 endef
define $(package)_build_cmds define $(package)_build_cmds