Disable support for VIA Padlock
This code defines a symbol 'unsupported' which is also in a newer version of libwebsockets. To fix 32bit linux builds just disable padlock support. Processors that support this are rare and old.
This commit is contained in:
parent
bfa9be85d3
commit
e33e0a5ea7
3 changed files with 17 additions and 1 deletions
1
thirdparty/README.md
vendored
1
thirdparty/README.md
vendored
|
@ -287,6 +287,7 @@ File extracted from upstream release tarball `mbedtls-2.16.0-apache.tgz`:
|
||||||
- All `*.h` from `include/mbedtls/` to `thirdparty/mbedtls/include/mbedtls/`
|
- All `*.h` from `include/mbedtls/` to `thirdparty/mbedtls/include/mbedtls/`
|
||||||
- All `*.c` from `library/` to `thirdparty/mbedtls/library/`
|
- All `*.c` from `library/` to `thirdparty/mbedtls/library/`
|
||||||
- Applied the patch in `thirdparty/mbedtls/1453.diff` (PR 1453). Soon to be merged upstream. Check it out at next update.
|
- Applied the patch in `thirdparty/mbedtls/1453.diff` (PR 1453). Soon to be merged upstream. Check it out at next update.
|
||||||
|
- Applied the patch in `thirdparty/mbedtls/padlock.diff`. This disables VIA padlock support which defines a symbol `unsupported` which clashses with a symbol in libwebsockets.
|
||||||
|
|
||||||
## miniupnpc
|
## miniupnpc
|
||||||
|
|
||||||
|
|
4
thirdparty/mbedtls/include/mbedtls/config.h
vendored
4
thirdparty/mbedtls/include/mbedtls/config.h
vendored
|
@ -2477,7 +2477,9 @@
|
||||||
*
|
*
|
||||||
* This modules adds support for the VIA PadLock on x86.
|
* This modules adds support for the VIA PadLock on x86.
|
||||||
*/
|
*/
|
||||||
#define MBEDTLS_PADLOCK_C
|
// -- GODOT start --
|
||||||
|
// #define MBEDTLS_PADLOCK_C
|
||||||
|
// -- GODOT end --
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* \def MBEDTLS_PEM_PARSE_C
|
* \def MBEDTLS_PEM_PARSE_C
|
||||||
|
|
13
thirdparty/mbedtls/padlock.diff
vendored
Normal file
13
thirdparty/mbedtls/padlock.diff
vendored
Normal file
|
@ -0,0 +1,13 @@
|
||||||
|
--- a/thirdparty/mbedtls/include/mbedtls/config.h
|
||||||
|
+++ b/thirdparty/mbedtls/include/mbedtls/config.h
|
||||||
|
@@ -2477,7 +2477,9 @@
|
||||||
|
*
|
||||||
|
* This modules adds support for the VIA PadLock on x86.
|
||||||
|
*/
|
||||||
|
-#define MBEDTLS_PADLOCK_C
|
||||||
|
+// -- GODOT start --
|
||||||
|
+// #define MBEDTLS_PADLOCK_C
|
||||||
|
+// -- GODOT end --
|
||||||
|
|
||||||
|
/**
|
||||||
|
* \def MBEDTLS_PEM_PARSE_C
|
Loading…
Reference in a new issue