Date: Sunday, December 15, 2019 @ 05:27:23 Author: kpcyrd Revision: 537715
Remove cpu detection from cmake file Added: monero/trunk/no-avx2.patch Modified: monero/trunk/PKGBUILD ---------------+ PKGBUILD | 9 ++++++--- no-avx2.patch | 25 +++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-12-15 05:19:14 UTC (rev 537714) +++ PKGBUILD 2019-12-15 05:27:23 UTC (rev 537715) @@ -2,7 +2,7 @@ pkgname=monero pkgver=0.15.0.1 -pkgrel=2 +pkgrel=3 pkgdesc="Monero: the secure, private, untraceable currency - release version (includes daemon, wallet and miner)" license=('custom:Cryptonote') arch=('x86_64') @@ -17,7 +17,8 @@ "git+https://github.com/trezor/trezor-common.git" "git+https://github.com/tevador/randomx" "monero.sysusers" - "monero.tmpfiles") + "monero.tmpfiles" + "no-avx2.patch") sha512sums=('SKIP' 'SKIP' 'SKIP' @@ -25,7 +26,8 @@ 'SKIP' 'SKIP' '2e4ecf3f305dab46e166f50c0451dd969927b485df544aebcf8115a65444573e6d57a8ac6bea64ce5ab4b5cce2c70f913d9ac3bce561c59acf89851edc76a22c' - 'ae3c300548e6ba5fdf6a203146e5dcaf1955c3e19820c0bb3a73bb70ec5629a3af00d43dac95b6f3832ded5c480e872d829981a63206016d4a64f3940b713357') + 'ae3c300548e6ba5fdf6a203146e5dcaf1955c3e19820c0bb3a73bb70ec5629a3af00d43dac95b6f3832ded5c480e872d829981a63206016d4a64f3940b713357' + 'a6ed21f23c8951e36200845421d395c1a56a064af64435ac3eef1e516678997fda4b452cd1da440e8fac7437971f81a901511dac27bbb1ff35ed631dcfe47c70') prepare() { cd "${pkgname}" @@ -36,6 +38,7 @@ git config submodule.external/trezor-common.url "$srcdir/trezor-common" git config submodule.external/randomx.url "$srcdir/randomx" git submodule update + patch --forward --strip=1 --input="${srcdir}/no-avx2.patch" } build() { Added: no-avx2.patch =================================================================== --- no-avx2.patch (rev 0) +++ no-avx2.patch 2019-12-15 05:27:23 UTC (rev 537715) @@ -0,0 +1,25 @@ +diff --git a/external/randomx/CMakeLists.txt b/external/randomx/CMakeLists.txt +index 40f0354..3bacafa 100644 +--- a/external/randomx/CMakeLists.txt ++++ b/external/randomx/CMakeLists.txt +@@ -102,20 +102,6 @@ if (ARCH_ID STREQUAL "x86_64" OR ARCH_ID STREQUAL "x86-64" OR ARCH_ID STREQUAL " + set_property(SOURCE src/jit_compiler_x86_static.S PROPERTY LANGUAGE C) + set_property(SOURCE src/jit_compiler_x86_static.S PROPERTY XCODE_EXPLICIT_FILE_TYPE sourcecode.asm) + +- if(ARCH STREQUAL "native") +- add_flag("-march=native") +- else() +- # default build has hardware AES enabled (software AES can be selected at runtime) +- add_flag("-maes") +- check_c_compiler_flag(-mssse3 HAVE_SSSE3) +- if(HAVE_SSSE3) +- set_source_files_properties(src/argon2_ssse3.c COMPILE_FLAGS -mssse3) +- endif() +- check_c_compiler_flag(-mavx2 HAVE_AVX2) +- if(HAVE_AVX2) +- set_source_files_properties(src/argon2_avx2.c COMPILE_FLAGS -mavx2) +- endif() +- endif() + endif() + + # PowerPC