浏览代码

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 8189abd64a0871871fbae5a8e94753b99a2af2ae)

Note: For the 3.1 branch, only modifies the README.md a bit as I had
kept the patch removed in master/3.2.
Rémi Verschelde 5 年之前
父节点
当前提交
40a0abea8d
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      thirdparty/README.md

+ 3 - 3
thirdparty/README.md

@@ -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
-  padlock support which defines a symbol `unsupported` which clashes with
-  a symbol in libwebsockets.
+- Applied the patch in `thirdparty/mbedtls/patches/padlock.diff`. This disables
+  VIA padlock support which defines a symbol `unsupported` which clashes with
+  a pre-defined symbol.
 
 
 
 
 ## miniupnpc
 ## miniupnpc