Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Boringssl and rules python fix for s390x #166

Merged
merged 3 commits into from
Jun 6, 2024
Merged

Boringssl and rules python fix for s390x #166

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7f0a5c
Boringssl s390x fix
May 31, 2024
5ca95d6
rules python fix for s390x
May 31, 2024
a0bb612
Update to minimum python version supported on s390x
surenderky Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bazel/repositories_extra.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def _python_minor_version(python_version):
return "_".join(python_version.split(".")[:-1])

# Python version for `rules_python`
PYTHON_VERSION = "3.11.3"
PYTHON_VERSION = "3.11.4"
phlax marked this conversation as resolved.
Show resolved Hide resolved
PYTHON_MINOR_VERSION = _python_minor_version(PYTHON_VERSION)

# Envoy deps that rely on a first stage of dependency loading in envoy_dependencies().
Expand All @@ -24,7 +24,7 @@ def envoy_dependencies_extra(
python_register_toolchains(
name = "python%s" % _python_minor_version(python_version),
python_version = python_version,
ignore_root_user_error = ignore_root_user_error,
ignore_root_user_error = True,
surenderky marked this conversation as resolved.
Show resolved Hide resolved
)

aspect_bazel_lib_dependencies()
2 changes: 2 additions & 0 deletions bssl-compat/third_party/boringssl/src/include/openssl/base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ extern "C" {
#define OPENSSL_32_BIT
#elif defined(__myriad2__)
#define OPENSSL_32_BIT
#elif defined(__s390__) || defined(__s390x__) || defined(__zarch__)
#define OPENSSL_64_BIT
#else
// Note BoringSSL only supports standard 32-bit and 64-bit two's-complement,
// little-endian architectures. Functions will not produce the correct answer
Expand Down