diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-25 10:17:54 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-25 10:17:54 +0200 |
| commit | 75c78316d648ddb96134b436120b666032733217 (patch) | |
| tree | dfefffc3f4a9f114cba218bd5d34e103ba81d2fa /extra | |
| parent | a30d4250c2e15d4a3776a827e40094441629cc72 (diff) | |
| parent | 10635c2833a951b11b1d56e388244127e257ffb5 (diff) | |
| download | mariadb-git-75c78316d648ddb96134b436120b666032733217.tar.gz | |
Merge 10.11 into 11.0
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 |