Skip to content

Commit

Permalink
[deps] Make OpenSSL build on macos and update
Browse files Browse the repository at this point in the history
We change up the openssl build generation to be able to generate builds
for other platforms and systems.

The initial added platforms are for macos. In the process of doing this
the build generation tooling has changed to be a python script that
understands all of the select permutations needed to generate the
stanzas needed for more than one platform.

Alongside this the perl script used to extract out the build details has
been changed. Rather than generating the build rules directly it now
exports the build information needed in the form of JSON outputs.

This has been tested on x86_64 for macos catalina and linux.

Right now there are probably some unixisms left in the code which will
limit its ability to build for windows.
  • Loading branch information
GregBowyer committed Aug 27, 2021
1 parent 4b06fd2 commit c58f740
Show file tree
Hide file tree
Showing 7 changed files with 4,430 additions and 480 deletions.
6 changes: 3 additions & 3 deletions build_tools/bazel/external_workspace.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ DEFAULT_EXTERNAL_URLS = {
"org_bzip_bzip2": ["https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz"],
"org_gnu_ncurses": ["https://invisible-mirror.net/archives/ncurses/ncurses-6.2.tar.gz"],
"org_gnu_readline": ["https://ftp.gnu.org/gnu/readline/readline-8.1.tar.gz"],
"org_openssl": ["https://www.openssl.org/source/openssl-1.1.1k.tar.gz"],
"org_openssl": ["https://www.openssl.org/source/openssl-1.1.1l.tar.gz"],
"org_sourceware_libffi": ["https://github.com/libffi/libffi/releases/download/v3.3/libffi-3.3.tar.gz"],
"org_sqlite": ["https://sqlite.org/2021/sqlite-amalgamation-3360000.zip"],
"org_tukaani": ["https://downloads.sourceforge.net/project/lzmautils/xz-5.2.5.tar.xz"],
Expand Down Expand Up @@ -145,8 +145,8 @@ def cpython_deps(urls = DEFAULT_EXTERNAL_URLS):
http_archive(
name = "org_openssl",
urls = urls["org_openssl"],
sha256 = "892a0875b9872acd04a9fde79b1f943075d5ea162415de3047c327df33fbaee5",
strip_prefix = "openssl-1.1.1k",
sha256 = "0b7a3e5e59c34827fe0c3a74b7ec8baef302b98fa80088d7f9153aa16fa76bd1",
strip_prefix = "openssl-1.1.1l",
build_file = filename_from_label("//thirdparty/openssl:BUILD.openssl"),
)

Expand Down
Loading

0 comments on commit c58f740

Please sign in to comment.