godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mbedtls: Re-add patch to disable VIA padlock 

The comment mentioned a conflict with libwebsockets, but we actually
still get this conflict even now that we don't use libwebsockets.
Not sure what component is clashing but we should basically just keep
this patch.

Follow-up to #36823.

(cherry picked from commit 8189abd64a)

Note: For the 3.1 branch, only modifies the README.md a bit as I had
kept the patch removed in master/3.2.
This commit is contained in:
Rémi Verschelde 2020-03-10 09:11:16 +01:00
parent 1e9c726231
commit 40a0abea8d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
thirdparty/README.md vendored
View File

@ -295,9 +295,9 @@ File extracted from upstream release tarball (`-apache.tgz` variant):
- LICENSE and apache-2.0.txt files - LICENSE and apache-2.0.txt files
- Applied the patch in `thirdparty/mbedtls/patches/1453.diff` (PR 1453). - Applied the patch in `thirdparty/mbedtls/patches/1453.diff` (PR 1453).
Soon to be merged upstream. Check it out at next update. Soon to be merged upstream. Check it out at next update.
- Applied the patch in `thirdparty/mbedtls/patches/padlock.diff`. This disables VIA - Applied the patch in `thirdparty/mbedtls/patches/padlock.diff`. This disables
padlock support which defines a symbol `unsupported` which clashes with VIA padlock support which defines a symbol `unsupported` which clashes with
a symbol in libwebsockets. a pre-defined symbol.
## miniupnpc ## miniupnpc