diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-18 14:52:13 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-01-18 14:52:13 +0100 |
| commit | 86059fd10a23662c2b56d4ef54d1db6041db1917 (patch) | |
| tree | c7643fc0523713b81b4c0698cc265598f6961609 /extra | |
| parent | ff72a9431a6559b691d3dcfb595e76546678313d (diff) | |
| parent | 9924466b3b9b3cdc590106e0036e6fb67d9aa4b0 (diff) | |
| download | mariadb-git-86059fd10a23662c2b56d4ef54d1db6041db1917.tar.gz | |
Merge branch '10.4' into 10.5
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 35c3b735bdd..7bd5f1694ed 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 |