Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add libsodium to the packages, the arm build was complaining about it.

Browse Source 
Fixup arm toolchain file.
This commit is contained in:
TheCharlatan 2018-09-10 23:22:41 +02:00
parent cbbf4d241b
commit ecaf5b3feb
4 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -440,8 +440,6 @@ add_definition_if_function_found(strptime HAVE_STRPTIME)
add_definitions(-DAUTO_INITIALIZE_EASYLOGGINGPP) add_definitions(-DAUTO_INITIALIZE_EASYLOGGINGPP)
# Generate header for embedded translations # Generate header for embedded translations
#add_subdirectory(translations)
#=======
# Generate header for embedded translations, use target toolchain if depends, otherwise use the # Generate header for embedded translations, use target toolchain if depends, otherwise use the
# lrelease and lupdate binaries from the host # lrelease and lupdate binaries from the host
include(ExternalProject) include(ExternalProject)
@ -451,7 +449,6 @@ ExternalProject_Add(generate_translations_header
STAMP_DIR ${LRELEASE_PATH} STAMP_DIR ${LRELEASE_PATH}
CMAKE_ARGS -DLRELEASE_PATH=${LRELEASE_PATH} CMAKE_ARGS -DLRELEASE_PATH=${LRELEASE_PATH}
INSTALL_COMMAND cmake -E echo "") INSTALL_COMMAND cmake -E echo "")
#>>>>>>> b1f43170... Add lrelease to the depends
include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations") include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
add_subdirectory(external) add_subdirectory(external)

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

@ -1,4 +1,4 @@
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 sodium
native_packages := native_ccache native_packages := native_ccache
wallet_packages=bdb wallet_packages=bdb

23
contrib/depends/packages/sodium.mk Normal file
View File

@ -0,0 +1,23 @@
package=sodium
$(package)_version=1.0.16
$(package)_download_path=https://github.com/jedisct1/libsodium/archive
$(package)_file_name=$($(package)_version).tar.gz
$(package)_sha256_hash=0c14604bbeab2e82a803215d65c3b6e74bb28291aaee6236d65c699ccfe1a98c
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)
endef
define $(package)_build_cmds
$(MAKE)
endef
define $(package)_stage_cmds
$(MAKE) DESTDIR=$($(package)_staging_dir) install
endef

15
contrib/depends/toolchain.cmake.in
View File

@ -62,12 +62,19 @@ else()
endif() endif()
if(ARCH STREQUAL "arm") if(ARCH STREQUAL "arm")
set(ARCH "armv6zk") set(ARCH "armv7-a")
set(ARMID "armv6zk") set(ARM ON)
set(ARM_ID "armv7-a")
set(BUILD_64 OFF) set(BUILD_64 OFF)
set(CMAKE_BUILD_TYPE release) set(CMAKE_BUILD_TYPE release)
set(BUILD_TAG "linux-armv6") set(BUILD_TAG "linux-armv7")
set(ARM6) set(ARM7)
elif(ARCH STREQUAL "aarch64")
set(ARCH "armv8-a")
set(ARM ON)
set(ARM_ID "armv8-a")
set(BUILD_TAG "linux-armv8")
set(BUILD_64 ON)
endif() endif()
#Create a new global cmake flag that indicates building with depends #Create a new global cmake flag that indicates building with depends