Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This commit contains fixes for `ml-metadata`'s build setup to enable wheel builds on macOS M1. The core build files have not been touched except for version increments of Bazel dependencies, and for `mariadbconnector-c`, whose build file needed to be updated to support the latest version. Several dependencies were upgraded to newer versions, with the update policy being "as recent as possible without breaking changes". A few gRPC dependencies were eliminated from `ml-metadata`'s workspace to avoid friction on subsequent gRPC updates (this includes e.g. `protobuf`, `zlib`). This change allows for M1 wheel builds without more external system dependencies outside of Bazel - the used build definitions contain M1 capabilities for sufficiently new versions of Bazel.
- Loading branch information
1 parent
790e26d
commit 35806b4
Showing
10 changed files
with
49 additions
and
60 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
--- libmariadb/secure/openssl.c | ||
+++ libmariadb/secure/openssl.c | ||
@@ -329,11 +329,7 @@ static int ma_tls_set_certs(MYSQL *mysql, SSL_CTX *ctx) | ||
if ((mysql->options.ssl_cipher && | ||
mysql->options.ssl_cipher[0] != 0)) | ||
{ | ||
- if( | ||
-#ifdef TLS1_3_VERSION | ||
- SSL_CTX_set_ciphersuites(ctx, mysql->options.ssl_cipher) == 0 && | ||
-#endif | ||
- SSL_CTX_set_cipher_list(ctx, mysql->options.ssl_cipher) == 0) | ||
+ if(SSL_CTX_set_cipher_list(ctx, mysql->options.ssl_cipher) == 0) | ||
goto error; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters