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

grpc: depend on re2 #61214

Closed
wants to merge 4 commits into from
Closed

grpc: depend on re2 #61214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6ebfad1
grpc: use homebrew re2
SMillerDev Sep 15, 2020
3b2bff5
re2: use cmake for build
SMillerDev Sep 16, 2020
8f0ada2
bloaty: revision bump for re2
SMillerDev Sep 16, 2020
89cfd42
dnsdist: revision bump for re2
SMillerDev Sep 16, 2020
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
2 changes: 1 addition & 1 deletion Formula/bloaty.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ class Bloaty < Formula
url "https://github.com/google/bloaty/releases/download/v1.1/bloaty-1.1.tar.bz2"
sha256 "a308d8369d5812aba45982e55e7c3db2ea4780b7496a5455792fb3dcba9abd6f"
license "Apache-2.0"
revision 2
revision 3

bottle do
cellar :any
Expand Down
2 changes: 1 addition & 1 deletion Formula/dnsdist.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ class Dnsdist < Formula
homepage "https://www.dnsdist.org/"
url "https://downloads.powerdns.com/releases/dnsdist-1.5.0.tar.bz2"
sha256 "2c07c4ef0c497f5223909ff181fe3ba7c6016962a2855cffe26b7f3609f27b58"
revision 1
revision 2

livecheck do
url "https://downloads.powerdns.com/releases/"
Expand Down
2 changes: 2 additions & 0 deletions Formula/grpc.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ class Grpc < Formula
depends_on "gflags"
depends_on "openssl@1.1"
depends_on "protobuf"
depends_on "re2"

def install
mkdir "cmake/build" do
Expand All @@ -43,6 +44,7 @@ def install
-DgRPC_PROTOBUF_PROVIDER=package
-DgRPC_SSL_PROVIDER=package
-DgRPC_ZLIB_PROVIDER=package
-DgRPC_RE2_PROVIDER=package
] + std_cmake_args

system "cmake", *args
Expand Down
11 changes: 10 additions & 1 deletion Formula/re2.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ class Re2 < Formula
version "20200801"
sha256 "6f4c8514249cd65b9e85d3e6f4c35595809a63ad71c5d93083e4d1dcdf9e0cd6"
license "BSD-3-Clause"
revision 1
head "https://github.com/google/re2.git"

bottle do
Expand All @@ -14,10 +15,18 @@ class Re2 < Formula
sha256 "018ee2711b2c739074221a3248a812b23fbe97be5222b618fc254ce658242fdd" => :high_sierra
end

depends_on "cmake" => :build

def install
ENV.cxx11

system "make", "install", "prefix=#{prefix}"
# Run this for pkg-config files
system "make", "common-install", "prefix=#{prefix}"

# Run this for the rest of the install
system "cmake", ".", "-DBUILD_SHARED_LIBS=ON", "-DRE2_BUILD_TESTING=OFF", *std_cmake_args
system "make"
system "make", "install"
end

test do
Expand Down