Skip to content

Use Bazel native build rules for BoringSSL. #2652

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

Merged
htuch merged 3 commits into from
Feb 22, 2018
Merged

Use Bazel native build rules for BoringSSL. #2652

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
ab4325c
Use Bazel native build rules for BoringSSL.
jmillikin-stripe Feb 21, 2018
31011a5
Add comment for chromium-stable-with-bazel branch
jmillikin-stripe Feb 21, 2018
841de01
Fix boringssl repository name to match upstream WORKSPACE.
jmillikin-stripe Feb 21, 2018
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
8 changes: 8 additions & 0 deletions bazel/repositories.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,7 @@ def envoy_dependencies(path = "@envoy_deps//", skip_targets = []):
# semi-standard in the Bazel community, intended to avoid both duplicate
# dependencies and name conflicts.
_com_google_absl()
_com_googlesource_boringssl()
_com_github_bombela_backward()
_com_github_cyan4973_xxhash()
_com_github_eile_tclap()
Expand Down Expand Up @@ -317,6 +318,13 @@ def _com_google_absl():
actual = "@com_google_absl//absl/numeric:int128",
)

def _com_googlesource_boringssl():
_repository_impl("com_googlesource_boringssl")

@PiotrSikora PiotrSikora Feb 21, 2018 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is wrong. While you're trying to come up with "semi-standard" name, you're ignoring the boringssl name provided in BoringSSL's WORKSPACE, which leads to a build time warning:

WARNING: /build/tmp/_bazel_bazel/436badd4919a15958fa3800a4e21074a/external/com_googlesource_boringssl/WORKSPACE:1: Workspace name in /build/tmp/_bazel_bazel/436badd4919a15958fa3800a4e21074a/external/com_googlesource_boringssl/WORKSPACE (@boringssl) does not match the name given in the repository's definition (@com_googlesource_boringssl); this will cause a build error in future versions

@jmillikin-stripe jmillikin-stripe Feb 21, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, I'd been looking at the chromium-stable branch and forgot WORKSPACE was populated in chromium-stable-with-bazel. Fixed.

native.bind(
name = "ssl",
actual = "@com_googlesource_boringssl//:ssl",
)

def _com_google_protobuf():
_repository_impl("com_google_protobuf")

Expand Down
5 changes: 5 additions & 0 deletions bazel/repository_locations.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ REPOSITORY_LOCATIONS = dict(
commit = "787891a3882795cee0364e8a0f0dda315578d155",
remote = "https://github.com/abseil/abseil-cpp",
),
com_googlesource_boringssl = dict(
# Use commits from branch "chromium-stable-with-bazel"
commit = "426db8db7d1cbd17573e295b52d7aab7a97ba1ff", # chromium-64.0.3282.119

@danielhochman danielhochman Feb 21, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you also add chromium-stable-with-bazel as the tag for future reference

@jmillikin-stripe jmillikin-stripe Feb 21, 2018

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

remote = "https://boringssl.googlesource.com/boringssl",
),
com_github_bombela_backward = dict(
commit = "44ae9609e860e3428cd057f7052e505b4819eb84", # 2018-02-06
remote = "https://github.com/bombela/backward-cpp",
Expand Down
1 change: 0 additions & 1 deletion bazel/target_recipes.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ TARGET_RECIPES = {
"tcmalloc_and_profiler": "gperftools",
"luajit": "luajit",
"nghttp2": "nghttp2",
"ssl": "boringssl",
"yaml_cpp": "yaml-cpp",
"zlib": "zlib",
}
16 changes: 0 additions & 16 deletions ci/build_container/build_recipes/boringssl.sh
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions ci/prebuilt/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@ cc_library(
includes = ["thirdparty_build/include"],
)

cc_library(
name = "crypto",
srcs = ["thirdparty_build/lib/libcrypto.a"],
hdrs = glob(["thirdparty_build/include/openssl/**/*.h"]),
includes = ["thirdparty_build/include"],
)

cc_library(
name = "event",
srcs = ["thirdparty_build/lib/libevent.a"],
Expand Down Expand Up @@ -52,12 +45,6 @@ cc_library(
includes = ["thirdparty_build/include"],
)

cc_library(
name = "ssl",
srcs = ["thirdparty_build/lib/libssl.a"],
deps = [":crypto"],
)

cc_library(
name = "tcmalloc_and_profiler",
srcs = ["thirdparty_build/lib/libtcmalloc_and_profiler.a"],
Expand Down