diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-18 16:37:40 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-18 16:37:40 +0100 |
commit | 26d8485244bcf94923ab5bbd754276c9010dd569 (patch) | |
tree | 77c74bf4703d0673430ab3a46395b3447e78afd3 /extra | |
parent | 88c35781cc9f5f3c63de98a8b6e7eb3378d4fae5 (diff) | |
parent | 795ff0daf0f1ba691735f64f6e3a08e9ecd0160b (diff) | |
download | mariadb-git-26d8485244bcf94923ab5bbd754276c9010dd569.tar.gz |
Merge branch '10.7' into 10.8
Diffstat (limited to 'extra')
-rw-r--r-- | extra/wolfssl/CMakeLists.txt | 2 | ||||
m--------- | extra/wolfssl/wolfssl | 0 |
2 files changed, 2 insertions, 0 deletions
diff --git a/extra/wolfssl/CMakeLists.txt b/extra/wolfssl/CMakeLists.txt index 1672f82fc6d..5f446663dc8 100644 --- a/extra/wolfssl/CMakeLists.txt +++ b/extra/wolfssl/CMakeLists.txt @@ -157,6 +157,8 @@ IF(WOLFSSL_X86_64_BUILD) ${WOLFCRYPT_SRCDIR}/sha512_asm.S ${WOLFCRYPT_SRCDIR}/sha256_asm.S) ADD_DEFINITIONS(-maes -msse4.2 -mpclmul) + # WolfSSL 5.5.4 bug - user_settings.h not included into aes_asm.S + SET_PROPERTY(SOURCE ${WOLFCRYPT_SRCDIR}/aes_asm.S APPEND PROPERTY COMPILE_OPTIONS "-DWOLFSSL_X86_64_BUILD") ENDIF() ENDIF() diff --git a/extra/wolfssl/wolfssl b/extra/wolfssl/wolfssl -Subproject f1e2165c591f074feb47872a8ff712713ec411e +Subproject 4fbd4fd36a21efd9d1a7e17aba390e91c78693b |