rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-30 03:03:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Darwin Sodium build

Browse source 
Clang needs to get its cctools path passed.
This commit is contained in:
TheCharlatan 2018-09-22 20:07:33 +02:00
parent bf1e1d979c
commit 0f4f873bf3
5 changed files with 38 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
contrib/depends/hosts/darwin.mk
View file

@ -2,13 +2,13 @@ OSX_MIN_VERSION=10.8
OSX_SDK_VERSION=10.11 OSX_SDK_VERSION=10.11
OSX_SDK=$(SDK_PATH)/MacOSX$(OSX_SDK_VERSION).sdk OSX_SDK=$(SDK_PATH)/MacOSX$(OSX_SDK_VERSION).sdk
LD64_VERSION=253.9 LD64_VERSION=253.9
darwin_CC=clang -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) darwin_CC=clang -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) -B $(host_prefix)/native/bin
darwin_CXX=clang++ -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) -stdlib=libc++ darwin_CXX=clang++ -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) --sysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) -stdlib=libc++ -B $(host_prefix)/native/bin
darwin_CFLAGS=-pipe darwin_CFLAGS=-pipe
darwin_CXXFLAGS=$(darwin_CFLAGS) darwin_CXXFLAGS=$(darwin_CFLAGS)
darwin_release_CFLAGS=-O2 darwin_release_CFLAGS=-O1
darwin_release_CXXFLAGS=$(darwin_release_CFLAGS) darwin_release_CXXFLAGS=$(darwin_release_CFLAGS)
darwin_debug_CFLAGS=-O1 darwin_debug_CFLAGS=-O1

6
contrib/depends/packages/packages.mk
View file

@ -1,16 +1,19 @@
packages:=boost openssl libevent zeromq cppzmq zlib expat ldns cppzmq readline libiconv qt sodium packages:=boost openssl libevent zeromq cppzmq zlib expat ldns cppzmq readline libiconv qt
native_packages := native_ccache 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
ifeq ($(host_os),linux) ifeq ($(host_os),linux)
packages += pcsc-lite packages += pcsc-lite
packages += unwind packages += unwind
packages += sodium
endif endif
ifeq ($(host_os),mingw32) ifeq ($(host_os),mingw32)
packages += icu4c packages += icu4c
packages += sodium
endif endif
ifneq ($(build_os),darwin) ifneq ($(build_os),darwin)
@ -18,4 +21,3 @@ darwin_native_packages += native_cctools native_cdrkit native_libdmg-hfsplus
packages += readline packages += readline
endif endif

24
contrib/depends/packages/sodium-darwin.mk Normal file
View file

@ -0,0 +1,24 @@
package=sodium-darwin
$(package)_version=1.0.15
$(package)_download_path=https://download.libsodium.org/libsodium/releases/
$(package)_file_name=libsodium-$($(package)_version).tar.gz
$(package)_sha256_hash=fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4
define $(package)_set_vars
$(package)_config_opts=--enable-static
$(package)_config_opts+=--prefix=$(host_prefix)
endef
define $(package)_config_cmds
./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"
endef
define $(package)_build_cmds
echo "path is problematic here" &&\
make
endef
define $(package)_stage_cmds
$(MAKE) DESTDIR=$($(package)_staging_dir) install
endef

8
contrib/depends/packages/sodium.mk
View file

@ -1,8 +1,8 @@
package=sodium package=sodium
$(package)_version=1.0.16 $(package)_version=1.0.15
$(package)_download_path=https://github.com/jedisct1/libsodium/archive $(package)_download_path=https://download.libsodium.org/libsodium/releases/
$(package)_file_name=$($(package)_version).tar.gz $(package)_file_name=libsodium-$($(package)_version).tar.gz
$(package)_sha256_hash=0c14604bbeab2e82a803215d65c3b6e74bb28291aaee6236d65c699ccfe1a98c $(package)_sha256_hash=fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4
define $(package)_set_vars define $(package)_set_vars
$(package)_config_opts=--enable-static $(package)_config_opts=--enable-static

6
contrib/depends/toolchain.cmake.in
View file

@ -26,9 +26,9 @@ SET(BOOST_IGNORE_SYSTEM_PATH ON)
SET(BOOST_ROOT @prefix@) SET(BOOST_ROOT @prefix@)
SET(BOOST_LIBRARYDIR @prefix@/lib) SET(BOOST_LIBRARYDIR @prefix@/lib)
SET(BOOST_IGNORE_SYSTEM_PATHS_DEFAULT OFF) SET(BOOST_IGNORE_SYSTEM_PATHS_DEFAULT OFF)
SET(Boost_NO_SYSTEM_PATHS TRUE) SET(BOOST_NO_SYSTEM_PATHS TRUE)
SET(Boost_USE_STATIC_LIBS TRUE) SET(BOOST_USE_STATIC_LIBS TRUE)
SET(Boost_USE_STATIC_RUNTIME TRUE) SET(BOOST_USE_STATIC_RUNTIME TRUE)
SET(OpenSSL_DIR @prefix@/lib) SET(OpenSSL_DIR @prefix@/lib)
SET(ARCHITECTURE @arch@) SET(ARCHITECTURE @arch@)