diff options
| author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-09-30 11:32:39 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2019-09-30 11:32:46 +0200 |
| commit | bb83d23ad8162b1bd31aae53fab1c1dee4523838 (patch) | |
| tree | a8ae51e04e24f657e7d5e5b5fde56a7011734158 /depends/patches/openssl/0001-Add-OpenSSL-termios-fix-for-musl-libc.patch | |
| parent | d6026ec874e69d3e2023848a03832eb3573dc3a5 (diff) | |
| parent | 568aa0cf8329293692e4249dabd94052533c050d (diff) | |
Merge #16926: depends: Add OpenSSL termios fix for musl libc
568aa0cf8329293692e4249dabd94052533c050d Add OpenSSL termios fix for musl libc (Nathan Marley)
Pull request description:
Currently the version of OpenSSL included in the depends system won't build on musl based systems because `termio.h` does not exist. The proper header named `termios.h` does exist.
This PR adds a patch for OpenSSL to replace the `termio.h` header with `termios.h`, which is the proper POSIX header as I understand it.
This is a known issue as `TERMIOS` (not `TERMIO`) should be the default, and is fixed in later versions of OpenSSL. There is discussion on the OpenSSL repo here: openssl/openssl#163
This has been [fixed in OpenSSL](https://github.com/openssl/openssl/commit/64e6bf64b36136d487e2fbf907f09612e69ae911).
This partly fixes #16925 and allows building Bitcoin on Alpine using the depends system.
ACKs for top commit:
laanwj:
ACK 568aa0cf8329293692e4249dabd94052533c050d
Tree-SHA512: d0aac116b7a1133bdecb34a9fb6c63db0336a3547585c07ed31ac9c5edb97e9570dcbf931e7fbc7172ce0735b6bfc11fb204e015532fcd90496a233e8fc17081
Diffstat (limited to 'depends/patches/openssl/0001-Add-OpenSSL-termios-fix-for-musl-libc.patch')
| -rw-r--r-- | depends/patches/openssl/0001-Add-OpenSSL-termios-fix-for-musl-libc.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/depends/patches/openssl/0001-Add-OpenSSL-termios-fix-for-musl-libc.patch b/depends/patches/openssl/0001-Add-OpenSSL-termios-fix-for-musl-libc.patch new file mode 100644 index 0000000000..003099bdc2 --- /dev/null +++ b/depends/patches/openssl/0001-Add-OpenSSL-termios-fix-for-musl-libc.patch @@ -0,0 +1,17 @@ +diff --git a/crypto/ui/ui_openssl.c b/crypto/ui/ui_openssl.c +index a38c758..d99edc2 100644 +--- a/crypto/ui/ui_openssl.c ++++ b/crypto/ui/ui_openssl.c +@@ -190,9 +190,9 @@ + # undef SGTTY + #endif + +-#if defined(linux) && !defined(TERMIO) +-# undef TERMIOS +-# define TERMIO ++#if defined(linux) ++# define TERMIOS ++# undef TERMIO + # undef SGTTY + #endif + |