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

Jump to bottom

Avoid gcc7 memcpy build error by updating BoringSSL #12752

Merged
merged 2 commits into from
Sep 2, 2017
Merged

Avoid gcc7 memcpy build error by updating BoringSSL #12752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bb458c
Avoid gcc7 memcpy build error by updating BoringSSL
louiehelm Sep 1, 2017
c75a106
Harmonize cmake for BoringSSL for windows build
louiehelm Sep 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion tensorflow/contrib/cmake/external/boringssl.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ include (ExternalProject)
set(boringssl_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/boringssl/src/boringssl/include)
#set(boringssl_EXTRA_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/boringssl/src)
set(boringssl_URL https://boringssl.googlesource.com/boringssl)
set(boringssl_TAG 17cf2cb1d226b0ba2401304242df7ddd3b6f1ff2)
set(boringssl_TAG ee7aa02)
set(boringssl_BUILD ${CMAKE_BINARY_DIR}/boringssl/src/boringssl-build)
#set(boringssl_LIBRARIES ${boringssl_BUILD}/obj/so/libboringssl.so)
set(boringssl_STATIC_LIBRARIES
Expand Down
8 changes: 4 additions & 4 deletions tensorflow/workspace.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,11 +573,11 @@ def tf_workspace(path_prefix="", tf_repo_name=""):
patched_http_archive(
name = "boringssl",
urls = [
"http://mirror.bazel.build/github.com/google/boringssl/archive/bbcaa15b0647816b9a1a9b9e0d209cd6712f0105.tar.gz",
"https://github.com/google/boringssl/archive/bbcaa15b0647816b9a1a9b9e0d209cd6712f0105.tar.gz", # 2016-07-11
Copy link
Contributor

Choose a reason for hiding this comment

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

Please also add the mirror.bazel.build link.
We take care of mirroring the URLs.
@jart could you help with the mirror here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

"http://mirror.bazel.build/github.com/google/boringssl/archive/e3860009a091cd1bd2bc189cdbc3c6d095abde84.tar.gz",
"https://github.com/google/boringssl/archive/e3860009a091cd1bd2bc189cdbc3c6d095abde84.tar.gz", # 2017-07-07
],
sha256 = "025264d6e9a7ad371f2f66d17a28b6627de0c9592dc2eb54afd062f68f1f9aa3",
strip_prefix = "boringssl-bbcaa15b0647816b9a1a9b9e0d209cd6712f0105",
sha256 = "02f5950f93c4fd3691771c07c9d04cf2999ab01383ff99da345249e93b0fcfb2",
Copy link
Member

Choose a reason for hiding this comment

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

Hi, sha256 seems wrong, please fix it. see #12986, #12984.

~/Downloads ❯❯❯ shasum -a 256 e3860009a091cd1bd2bc189cdbc3c6d095abde84.tar.gz
a9a3673b1f7bd80ef563e9de1d9ccdb5126dc0cce6377977009092148993c4fe  e3860009a091cd1bd2bc189cdbc3c6d095abde84.tar.gz

Copy link
Member

Choose a reason for hiding this comment

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

I open #12995 as hotfix . Please take a check, thanks.

strip_prefix = "boringssl-e3860009a091cd1bd2bc189cdbc3c6d095abde84",
Copy link
Contributor

Choose a reason for hiding this comment

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

Could you also make the same change to the file:
https://github.com/tensorflow/tensorflow/blob/master/tensorflow/contrib/cmake/external/boringssl.cmake

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

This will fix #12404 for windows (and the timeout failure that #12404 introduced).

# Add patch to boringssl code to support s390x
patch_file = str(Label("//third_party/boringssl:add_boringssl_s390x.patch")),
)
Expand Down
4 changes: 2 additions & 2 deletions third_party/boringssl/add_boringssl_s390x.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ index 7a3adfb..88012ad 100644
--- a/src/include/openssl/base.h
+++ b/src/include/openssl/base.h
@@ -94,6 +94,8 @@ extern "C" {
#elif defined(__pnacl__)
#define OPENSSL_32_BIT
#define OPENSSL_PNACL
#elif defined(__myriad2__)
#define OPENSSL_32_BIT
+#elif defined(__s390x__)
+#define OPENSSL_64_BIT
#else
Expand Down