From a069482773576bee8155c97438c3fffce145bdfc Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Thu, 27 Feb 2020 21:12:28 -0500 Subject: [PATCH 1/4] Port build-arm.sh from @radix42 at https://github.com/MercerWeissAlt/komodo/tree/dev-aarch64 --- zcutil/build-arm.sh | 63 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) create mode 100644 zcutil/build-arm.sh diff --git a/zcutil/build-arm.sh b/zcutil/build-arm.sh new file mode 100644 index 000000000..26901568b --- /dev/null +++ b/zcutil/build-arm.sh @@ -0,0 +1,63 @@ +#!/bin/bash +# Copyright (c) 2019-2020 The Hush developers +# Original aarch64 port by radix42. Thank you! + +set -eu -o pipefail + +cat <<'EOF' + ________________ +< Building Hush! > + ---------------- + \ ^__^ + \ (oo)\_______ + (__)\ )\/\ + ||----w | + || || +EOF + +if [ "x$*" = 'x--help' ] +then + cat ./zcutil/dragon.txt + cat < Date: Thu, 27 Feb 2020 21:25:38 -0500 Subject: [PATCH 2/4] Rogue fixes for arm --- src/cc/makerogue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/cc/makerogue b/src/cc/makerogue index ff16cbb16..4df276b87 100755 --- a/src/cc/makerogue +++ b/src/cc/makerogue @@ -1,4 +1,6 @@ #!/bin/sh +# Copyright (c) 2019-2020 The Hush developers + cd rogue; make clean; @@ -19,7 +21,7 @@ if [ "$HOST" = "x86_64-w64-mingw32" ]; then fi else echo building rogue... - ./configure + ./configure --build=aarch64-unknown-linux-gnu if make "$@"; then echo rogue build SUCCESSFUL cd .. -- 2.30.2 From be0e32b2ed7c0bb5c429f1f75ca16e02524e5470 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Thu, 27 Feb 2020 21:33:29 -0500 Subject: [PATCH 3/4] Remove __amd64__ since other 64bit systems like aarch64 support this --- src/komodo_curve25519.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/komodo_curve25519.h b/src/komodo_curve25519.h index cba40561b..c3441e0a5 100644 --- a/src/komodo_curve25519.h +++ b/src/komodo_curve25519.h @@ -1,3 +1,4 @@ +// Copyright (c) 2019-2020 The Hush developers /****************************************************************************** * Copyright © 2014-2019 The SuperNET Developers. * * * @@ -81,7 +82,7 @@ bits320 fexpand(bits256 basepoint) return(out); } -#if __amd64__ +//#if __amd64__ // donna: special gcc mode for 128-bit integers. It's implemented on 64-bit platforms only as far as I know. typedef unsigned uint128_t __attribute__((mode(TI))); @@ -1010,4 +1011,4 @@ int32_t komodo_kvsigverify(uint8_t *buf,int32_t len,uint256 _pubkey,uint256 sig) return(0); } -#endif +//#endif -- 2.30.2 From a60b168e40ea387dc87e7c34a902b34a972d0fdc Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Thu, 27 Feb 2020 21:34:43 -0500 Subject: [PATCH 4/4] Downgrade to Rust 1.28 --- depends/packages/rust.mk | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/depends/packages/rust.mk b/depends/packages/rust.mk index 9cfb95054..c5e93a9ae 100644 --- a/depends/packages/rust.mk +++ b/depends/packages/rust.mk @@ -1,24 +1,12 @@ package=rust -$(package)_version=1.32.0 +$(package)_version=1.28.0 $(package)_download_path=https://static.rust-lang.org/dist - -$(package)_file_name_linux=rust-$($(package)_version)-x86_64-unknown-linux-gnu.tar.gz -$(package)_sha256_hash_linux=e024698320d76b74daf0e6e71be3681a1e7923122e3ebd03673fcac3ecc23810 +$(package)_file_name_linux=rust-$($(package)_version)-aarch64-unknown-linux-gnu.tar.gz +$(package)_sha256_hash_linux=9b6fbcee73070332c811c0ddff399fa31965bec62ef258656c0c90354f6231c1 $(package)_file_name_darwin=rust-$($(package)_version)-x86_64-apple-darwin.tar.gz -$(package)_sha256_hash_darwin=f0dfba507192f9b5c330b5984ba71d57d434475f3d62bd44a39201e36fa76304 +$(package)_sha256_hash_darwin=5d7a70ed4701fe9410041c1eea025c95cad97e5b3d8acc46426f9ac4f9f02393 $(package)_file_name_mingw32=rust-$($(package)_version)-x86_64-pc-windows-gnu.tar.gz -$(package)_sha256_hash_mingw32=358e1435347c67dbf33aa9cad6fe501a833d6633ed5d5aa1863d5dffa0349be9 - -ifeq ($(build_os),darwin) -$(package)_file_name=$($(package)_file_name_darwin) -$(package)_sha256_hash=$($(package)_sha256_hash_darwin) -else ifeq ($(host_os),mingw32) -$(package)_file_name=$($(package)_file_name_mingw32) -$(package)_sha256_hash=$($(package)_sha256_hash_mingw32) -else -$(package)_file_name=$($(package)_file_name_linux) -$(package)_sha256_hash=$($(package)_sha256_hash_linux) -endif +$(package)_sha256_hash_mingw32=55c07426f791c51c8a2b6934b35784175c4abb4e03f123f3e847109c4dc1ad8b ifeq ($(host_os),mingw32) $(package)_build_subdir=buildos -- 2.30.2