diff options
| author | Andy Postnikov <apostnikov@gmail.com> | 2018-03-30 05:01:50 +0300 |
|---|---|---|
| committer | Andy Postnikov <apostnikov@gmail.com> | 2018-03-30 22:58:46 +0300 |
| commit | 62a466fa8c2aa2267fa5d903f5f80e39a3e25d70 (patch) | |
| tree | d3d7ff1bbdf047ed5f1222a689a0fcca48058a6d /testing/monero/disable-aes-on-s390x.patch | |
| parent | 86dbf0b83fdaa5a1a0842b680406debcfda8acf8 (diff) | |
| download | aports-62a466fa8c2aa2267fa5d903f5f80e39a3e25d70.tar.bz2 aports-62a466fa8c2aa2267fa5d903f5f80e39a3e25d70.tar.xz | |
testing/monero: upgrade to 0.12.0.0
Diffstat (limited to 'testing/monero/disable-aes-on-s390x.patch')
| -rw-r--r-- | testing/monero/disable-aes-on-s390x.patch | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/testing/monero/disable-aes-on-s390x.patch b/testing/monero/disable-aes-on-s390x.patch index 7dfa50ec3b..8581bb7544 100644 --- a/testing/monero/disable-aes-on-s390x.patch +++ b/testing/monero/disable-aes-on-s390x.patch @@ -1,10 +1,6 @@ -this patch needs to be changed in next release as git already changed - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3d53e04..7e3dd2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -90,6 +90,10 @@ if(ARCH_ID STREQUAL "ppc64le") +@@ -139,6 +139,10 @@ set(PPC64LE 1) endif() @@ -15,12 +11,12 @@ index 3d53e04..7e3dd2c 100644 if(WIN32 OR ARM) set(OPT_FLAGS_RELEASE "-O2") else() -@@ -451,10 +455,12 @@ else() - - option(NO_AES "Explicitly disable AES support" ${NO_AES}) - -- if(NOT NO_AES AND NOT ARM AND NOT PPC64LE) -+ if(NOT NO_AES AND NOT ARM AND NOT PPC64LE AND NOT S390X) +@@ -592,10 +596,12 @@ + message(STATUS "AES support explicitly disabled") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNO_AES") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNO_AES") +- elseif(NOT ARM AND NOT PPC64LE) ++ elseif(NOT ARM AND NOT PPC64LE AND NOT S390X) message(STATUS "AES support enabled") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes") |