Skip to content
This repository has been archived by the owner on Mar 28, 2022. It is now read-only.

Commit

Permalink
Bump version of stout-eventuals, fix local build
Browse files Browse the repository at this point in the history
Update stout-eventuals in light of recent changes, in particular the
inclusion of Post and Get that relies on curl. The inclusion of curl
introduces two new repo dependencies included in this commit.

As outlined in issue #17, building `:grpc` locally using `gcc` is
currently broken by `.bazelrc`. This commit works around it by removing
the offending compiler flags, allowing the library to be built locally.
This is not a fix for the issue: we want those compiler flags in there,
conditionally.
  • Loading branch information
Gorm Galster committed Sep 24, 2021
1 parent 531d7e1 commit a2f8da3
Show file tree
Hide file tree
Showing 6 changed files with 85 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Specific Bazel build/test options.

#build --cxxopt='-Werror=thread-safety-analysis' --cxxopt='-Werror=thread-safety-reference'
build --cxxopt='-std=c++17'
build --cxxopt='-Werror=thread-safety-analysis' --cxxopt='-Werror=thread-safety-reference'
test --cxxopt='-fstandalone-debug' -c dbg --strip='never'
Empty file.
39 changes: 39 additions & 0 deletions 3rdparty/bazel-rules-curl/repos.bzl
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
"""Adds repostories/archives."""

########################################################################
# DO NOT EDIT THIS FILE unless you are inside the
# https://github.com/3rdparty/bazel-rules-curl repository. If you
# encounter it anywhere else it is because it has been copied there in
# order to simplify adding transitive dependencies. If you want a
# different version of bazel-rules-curl follow the Bazel build
# instructions at https://github.com/3rdparty/bazel-rules-curl.
########################################################################

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
load("//3rdparty/bazel-rules-openssl:repos.bzl", openssl_repos="repos")

def repos(external = True, repo_mapping = {}):
maybe(
http_archive,
name = "rules_foreign_cc",
url = "https://github.com/bazelbuild/rules_foreign_cc/archive/0.5.1.tar.gz",
sha256 = "33a5690733c5cc2ede39cb62ebf89e751f2448e27f20c8b2fbbc7d136b166804",
strip_prefix = "rules_foreign_cc-0.5.1",
repo_mapping = repo_mapping,
)

openssl_repos(
repo_mapping = repo_mapping,
)

if external:
maybe(
git_repository,
name = "com_github_3rdparty_bazel_rules_curl",
remote = "https://github.com/3rdparty/bazel-rules-curl",
commit = "589c72943a70eb7a0ee123969015f1a6deacf316",
shallow_since = "1632331010 +0300",
repo_mapping = repo_mapping,
)
Empty file.
34 changes: 34 additions & 0 deletions 3rdparty/bazel-rules-openssl/repos.bzl
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
"""Adds repostories/archives."""

########################################################################
# DO NOT EDIT THIS FILE unless you are inside the
# https://github.com/3rdparty/bazel-rules-openssl repository. If you
# encounter it anywhere else it is because it has been copied there in
# order to simplify adding transitive dependencies. If you want a
# different version of bazel-rules-openssl follow the Bazel build
# instructions at https://github.com/3rdparty/bazel-rules-openssl.
########################################################################

load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")

def repos(external = True, repo_mapping = {}):
maybe(
http_archive,
name = "rules_foreign_cc",
url = "https://github.com/bazelbuild/rules_foreign_cc/archive/0.5.1.tar.gz",
sha256 = "33a5690733c5cc2ede39cb62ebf89e751f2448e27f20c8b2fbbc7d136b166804",
strip_prefix = "rules_foreign_cc-0.5.1",
repo_mapping = repo_mapping,
)

if external:
maybe(
git_repository,
name = "com_github_3rdparty_bazel_rules_openssl",
remote = "https://github.com/3rdparty/bazel-rules-openssl",
commit = "fd41d1a19c75dd82979c76fc0b2aadd6c4393e89",
shallow_since = "1632212203 +0000",
repo_mapping = repo_mapping,
)
15 changes: 11 additions & 4 deletions 3rdparty/stout-eventuals/repos.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,26 @@
########################################################################

load("//3rdparty/bazel-rules-libuv:repos.bzl", libuv_repos="repos")
load("//3rdparty/bazel-rules-curl:repos.bzl", curl_repos="repos")

load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")

def repos(external = True, repo_mapping = {}):
libuv_repos(
repo_mapping = repo_mapping
)

if external and "com_github_3rdparty_stout_eventuals" not in native.existing_rules():
git_repository(
curl_repos(
repo_mapping = repo_mapping
)

if external:
maybe(
git_repository,
name = "com_github_3rdparty_stout_eventuals",
remote = "https://github.com/3rdparty/stout-eventuals",
commit = "b94a9ddd99f6775916a779ad36a2331f8eb11868",
shallow_since = "1629460595 +0200",
commit = "fbfb1a8061b198b6393cae284d6930cf92518168",
#shallow_since = "1629460595 +0200",
repo_mapping = repo_mapping,
)

0 comments on commit a2f8da3

Please sign in to comment.