diff options
| author | TheCharlatan <seb.kung@gmail.com> | 2018-09-10 23:22:41 +0200 |
|---|---|---|
| committer | TheCharlatan <seb.kung@gmail.com> | 2018-09-17 16:09:50 +0200 |
| commit | ecaf5b3feb2272ee8b9aec7f10d427dc20318d22 (patch) | |
| tree | f7fa0cabc223ee909f615ac5d86abe480d6f56f9 | |
| parent | Adapt translations to upstream changes (diff) | |
| download | monero-ecaf5b3feb2272ee8b9aec7f10d427dc20318d22.tar.xz | |
Add libsodium to the packages, the arm build was complaining about it.
Fixup arm toolchain file.
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | contrib/depends/packages/packages.mk | 2 | ||||
| -rw-r--r-- | contrib/depends/packages/sodium.mk | 23 | ||||
| -rw-r--r-- | contrib/depends/toolchain.cmake.in | 15 |
4 files changed, 35 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 95b57e49d..6d4fe96e5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -440,8 +440,6 @@ add_definition_if_function_found(strptime HAVE_STRPTIME) add_definitions(-DAUTO_INITIALIZE_EASYLOGGINGPP) # Generate header for embedded translations -#add_subdirectory(translations) -#======= # Generate header for embedded translations, use target toolchain if depends, otherwise use the # lrelease and lupdate binaries from the host include(ExternalProject) @@ -451,7 +449,6 @@ ExternalProject_Add(generate_translations_header STAMP_DIR ${LRELEASE_PATH} CMAKE_ARGS -DLRELEASE_PATH=${LRELEASE_PATH} INSTALL_COMMAND cmake -E echo "") -#>>>>>>> b1f43170... Add lrelease to the depends include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations") add_subdirectory(external) diff --git a/contrib/depends/packages/packages.mk b/contrib/depends/packages/packages.mk index d6d6b2d44..28eaf34c5 100644 --- a/contrib/depends/packages/packages.mk +++ b/contrib/depends/packages/packages.mk @@ -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 wallet_packages=bdb diff --git a/contrib/depends/packages/sodium.mk b/contrib/depends/packages/sodium.mk new file mode 100644 index 000000000..885b1ea19 --- /dev/null +++ b/contrib/depends/packages/sodium.mk @@ -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 diff --git a/contrib/depends/toolchain.cmake.in b/contrib/depends/toolchain.cmake.in index 5ab93b1c3..d2fdd4270 100644 --- a/contrib/depends/toolchain.cmake.in +++ b/contrib/depends/toolchain.cmake.in @@ -62,12 +62,19 @@ else() endif() if(ARCH STREQUAL "arm") - set(ARCH "armv6zk") - set(ARMID "armv6zk") + set(ARCH "armv7-a") + set(ARM ON) + set(ARM_ID "armv7-a") set(BUILD_64 OFF) set(CMAKE_BUILD_TYPE release) - set(BUILD_TAG "linux-armv6") - set(ARM6) + set(BUILD_TAG "linux-armv7") + 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() #Create a new global cmake flag that indicates building with depends |