Hi, On 06/28/2017 14:08, Matthias Fechner wrote: > Thanks Steve, > > I already added it into our repository we work with: > http://gitlab.toco-domains.de/FreeBSD/GitLab/commits/9.1 > > I hope that is ok for you? > My poudiere is just building and I think it will take the full night: > https://pkg.fechner.net/index.html > > I will try to do some tests (at least give the build a try). As I do not have > any experience with ruby, I do not really have an idea how to test it. >
That's not going to work as is, see my previous message. I have committed a port for boringssl and patched devel/grpc to use it and updated the rubygem-grpc patch. See attached (as always, let me know if it doesn't come through). Note this will make boringssl a runtime dep of GitLab (via rubygem-grpc via grpc). This lets rubygem-grpc pass it's tests, except for 1, which seems like just a test which needs updating. If you want to run the tests, copy these files/directories: Gemfile Rakefile src/proto src/ruby/.rubocop.yml src/ruby/.rubocop_todo.yml from the devel/grpc WRKSRC to the corresponding location in the rubygem-grpc WRKSRC. Then install rubygem-bundler, run "bundle install" and finally run "rake" to actually execute the tests and see results. (Bundler will install a bunch of gems outside pkg, so you may want to do this in a throwaway jail, such as in poudriere testport -i). Vanilla, could you commit the devel/grpc parts of the attached patch, or approve me committing it? I think it's better to create a separate port for boringssl and use it than to have both devel/grpc and net/rubygem-grpc bundle it. I know boringssl isn't meant to be used this way, based on the docs. But I think it's better to avoid bundling it, because bundling allows to possibly use different versions in different ports and also means more work to update it. Also, the github mirror used for the currently bundling of boringssl in devel/grpc (github.com/boringssl/boringssl) is an unofficial mirror that seems to have died a while ago. This uses the github.com/google/boringssl mirror which seems current and updating. So if we are against this change to devel/grpc we should at least update the bundled version of boringssl there to the newer repo and version. Thanks, Steve
Index: net/Makefile
===================================================================
--- net/Makefile (revision 444576)
+++ net/Makefile (working copy)
@@ -1186,6 +1186,7 @@
SUBDIR += rubygem-gitaly
SUBDIR += rubygem-gitlab_omniauth-ldap
SUBDIR += rubygem-gitlab_omniauth-ldap1
+ SUBDIR += rubygem-grpc
SUBDIR += rubygem-http_parser.rb
SUBDIR += rubygem-httpauth
SUBDIR += rubygem-ipaddress
Index: net/rubygem-grpc/Makefile
===================================================================
--- net/rubygem-grpc/Makefile (nonexistent)
+++ net/rubygem-grpc/Makefile (working copy)
@@ -0,0 +1,29 @@
+# $FreeBSD$
+
+PORTNAME= grpc
+PORTVERSION= 1.4.0
+CATEGORIES= net rubygems
+MASTER_SITES= RG
+
+MAINTAINER= t...@freebsd.org
+COMMENT= Ruby implementation of gRPC
+
+LICENSE= BSD3CLAUSE
+
+RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss \
+ grpc>=0:devel/grpc \
+ rubygem-google-protobuf>=3.0:devel/rubygem-google-protobuf \
+ rubygem-googleauth>=0.5.1:security/rubygem-googleauth
+LIB_DEPENDS= libcares.so:dns/c-ares
+
+MAKE_JOBS_UNSAFE=yes
+
+USE_RUBY= yes
+USES= gem gmake pkgconfig
+
+post-extract:
+ @${RM} -r ${WRKSRC}/include ${WRKSRC}/third_party ${WRKSRC}/src/boringssl \
+ ${WRKSRC}/src/core ${WRKSRC}/Makefile ${WRKSRC}/.yardopts ${WRKSRC}/etc
+ @${CP} ${FILESDIR}/grpc.gemspec ${WRKSRC}
+
+.include <bsd.port.mk>
Property changes on: net/rubygem-grpc/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: net/rubygem-grpc/distinfo
===================================================================
--- net/rubygem-grpc/distinfo (nonexistent)
+++ net/rubygem-grpc/distinfo (working copy)
@@ -0,0 +1,3 @@
+TIMESTAMP = 1498614608
+SHA256 (rubygem/grpc-1.4.0.gem) = 927d8d3b486d8fa597cab6932b77a7a2b932e66d240d2182599ae2bac82e38ea
+SIZE (rubygem/grpc-1.4.0.gem) = 2736128
Property changes on: net/rubygem-grpc/distinfo
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: net/rubygem-grpc/files/grpc.gemspec
===================================================================
--- net/rubygem-grpc/files/grpc.gemspec (nonexistent)
+++ net/rubygem-grpc/files/grpc.gemspec (working copy)
@@ -0,0 +1,70 @@
+# -*- encoding: utf-8 -*-
+# stub: grpc 1.4.0 ruby src/ruby/lib src/ruby/bin src/ruby/pb
+# stub: src/ruby/ext/grpc/extconf.rb
+
+Gem::Specification.new do |s|
+ s.name = "grpc".freeze
+ s.version = "1.4.0"
+
+ s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+ s.require_paths = ["src/ruby/lib".freeze, "src/ruby/bin".freeze, "src/ruby/pb".freeze]
+ s.authors = ["gRPC Authors".freeze]
+ s.bindir = "src/ruby/bin".freeze
+ s.date = "2017-06-21"
+ s.description = "Send RPCs from Ruby using GRPC".freeze
+ s.email = "temi...@google.com".freeze
+ s.extensions = ["src/ruby/ext/grpc/extconf.rb".freeze]
+ s.files = ["src/ruby/bin/apis/google/protobuf/empty.rb".freeze, "src/ruby/bin/apis/pubsub_demo.rb".freeze, "src/ruby/bin/apis/tech/pubsub/proto/pubsub.rb".freeze, "src/ruby/bin/apis/tech/pubsub/proto/pubsub_services.rb".freeze, "src/ruby/bin/math_client.rb".freeze, "src/ruby/bin/math_pb.rb".freeze, "src/ruby/bin/math_server.rb".freeze, "src/ruby/bin/math_services_pb.rb".freeze, "src/ruby/bin/noproto_client.rb".freeze, "src/ruby/bin/noproto_server.rb".freeze, "src/ruby/ext/grpc/extconf.rb".freeze, "src/ruby/ext/grpc/rb_byte_buffer.c".freeze, "src/ruby/ext/grpc/rb_byte_buffer.h".freeze, "src/ruby/ext/grpc/rb_call.c".freeze, "src/ruby/ext/grpc/rb_call.h".freeze, "src/ruby/ext/grpc/rb_call_credentials.c".freeze, "src/ruby/ext/grpc/rb_call_credentials.h".freeze, "src/ruby/ext/grpc/rb_channel.c".freeze, "src/ruby/ext/grpc/rb_channel.h".freeze, "src/ruby/ext/grpc/rb_channel_args.c".freeze, "src/ruby/ext/grpc/rb_channel_args.h".freeze, "src/ruby/ext/grpc/rb_channel_credentials.c".freeze, "src/ruby/ext/grpc/rb_channel_credentials.h".freeze, "src/ruby/ext/grpc/rb_completion_queue.c".freeze, "src/ruby/ext/grpc/rb_completion_queue.h".freeze, "src/ruby/ext/grpc/rb_compression_options.c".freeze, "src/ruby/ext/grpc/rb_compression_options.h".freeze, "src/ruby/ext/grpc/rb_event_thread.c".freeze, "src/ruby/ext/grpc/rb_event_thread.h".freeze, "src/ruby/ext/grpc/rb_grpc.c".freeze, "src/ruby/ext/grpc/rb_grpc.h".freeze, "src/ruby/ext/grpc/rb_grpc_imports.generated.c".freeze, "src/ruby/ext/grpc/rb_grpc_imports.generated.h".freeze, "src/ruby/ext/grpc/rb_loader.c".freeze, "src/ruby/ext/grpc/rb_loader.h".freeze, "src/ruby/ext/grpc/rb_server.c".freeze, "src/ruby/ext/grpc/rb_server.h".freeze, "src/ruby/ext/grpc/rb_server_credentials.c".freeze, "src/ruby/ext/grpc/rb_server_credentials.h".freeze, "src/ruby/lib/grpc.rb".freeze, "src/ruby/lib/grpc/core/time_consts.rb".freeze, "src/ruby/lib/grpc/errors.rb".freeze, "src/ruby/lib/grpc/generic/active_call.rb".freeze, "src/ruby/lib/grpc/generic/bidi_call.rb".freeze, "src/ruby/lib/grpc/generic/client_stub.rb".freeze, "src/ruby/lib/grpc/generic/rpc_desc.rb".freeze, "src/ruby/lib/grpc/generic/rpc_server.rb".freeze, "src/ruby/lib/grpc/generic/service.rb".freeze, "src/ruby/lib/grpc/grpc.rb".freeze, "src/ruby/lib/grpc/logconfig.rb".freeze, "src/ruby/lib/grpc/notifier.rb".freeze, "src/ruby/lib/grpc/version.rb".freeze, "src/ruby/pb/README.md".freeze, "src/ruby/pb/generate_proto_ruby.sh".freeze, "src/ruby/pb/grpc/health/checker.rb".freeze, "src/ruby/pb/grpc/health/v1/health_pb.rb".freeze, "src/ruby/pb/grpc/health/v1/health_services_pb.rb".freeze, "src/ruby/pb/grpc/testing/duplicate/echo_duplicate_services_pb.rb".freeze, "src/ruby/pb/grpc/testing/metrics_pb.rb".freeze, "src/ruby/pb/grpc/testing/metrics_services_pb.rb".freeze, "src/ruby/pb/src/proto/grpc/testing/empty_pb.rb".freeze, "src/ruby/pb/src/proto/grpc/testing/messages_pb.rb".freeze, "src/ruby/pb/src/proto/grpc/testing/test_pb.rb".freeze, "src/ruby/pb/src/proto/grpc/testing/test_services_pb.rb".freeze, "src/ruby/pb/test/client.rb".freeze, "src/ruby/pb/test/server.rb".freeze, "src/ruby/spec/call_credentials_spec.rb".freeze, "src/ruby/spec/call_spec.rb".freeze, "src/ruby/spec/channel_connection_spec.rb".freeze, "src/ruby/spec/channel_credentials_spec.rb".freeze, "src/ruby/spec/channel_spec.rb".freeze, "src/ruby/spec/client_server_spec.rb".freeze, "src/ruby/spec/compression_options_spec.rb".freeze, "src/ruby/spec/error_sanity_spec.rb".freeze, "src/ruby/spec/generic/active_call_spec.rb".freeze, "src/ruby/spec/generic/client_stub_spec.rb".freeze, "src/ruby/spec/generic/rpc_desc_spec.rb".freeze, "src/ruby/spec/generic/rpc_server_pool_spec.rb".freeze, "src/ruby/spec/generic/rpc_server_spec.rb".freeze, "src/ruby/spec/generic/service_spec.rb".freeze, "src/ruby/spec/pb/duplicate/codegen_spec.rb".freeze, "src/ruby/spec/pb/health/checker_spec.rb".freeze, "src/ruby/spec/server_credentials_spec.rb".freeze, "src/ruby/spec/server_spec.rb".freeze, "src/ruby/spec/spec_helper.rb".freeze, "src/ruby/spec/testdata/README".freeze, "src/ruby/spec/testdata/ca.pem".freeze, "src/ruby/spec/testdata/server1.key".freeze, "src/ruby/spec/testdata/server1.pem".freeze, "src/ruby/spec/time_consts_spec.rb".freeze]
+ s.homepage = "https://github.com/google/grpc/tree/master/src/ruby".freeze
+ s.licenses = ["BSD-3-Clause".freeze]
+ s.required_ruby_version = Gem::Requirement.new(">= 2.0.0".freeze)
+ s.rubygems_version = "2.6.12".freeze
+ s.summary = "GRPC system in Ruby".freeze
+ s.test_files = ["src/ruby/spec/server_spec.rb".freeze, "src/ruby/spec/channel_spec.rb".freeze, "src/ruby/spec/testdata/README".freeze, "src/ruby/spec/testdata/ca.pem".freeze, "src/ruby/spec/testdata/server1.key".freeze, "src/ruby/spec/testdata/server1.pem".freeze, "src/ruby/spec/time_consts_spec.rb".freeze, "src/ruby/spec/channel_connection_spec.rb".freeze, "src/ruby/spec/call_spec.rb".freeze, "src/ruby/spec/generic/rpc_server_spec.rb".freeze, "src/ruby/spec/generic/rpc_desc_spec.rb".freeze, "src/ruby/spec/generic/active_call_spec.rb".freeze, "src/ruby/spec/generic/client_stub_spec.rb".freeze, "src/ruby/spec/generic/rpc_server_pool_spec.rb".freeze, "src/ruby/spec/generic/service_spec.rb".freeze, "src/ruby/spec/pb/duplicate/codegen_spec.rb".freeze, "src/ruby/spec/pb/health/checker_spec.rb".freeze, "src/ruby/spec/client_server_spec.rb".freeze, "src/ruby/spec/compression_options_spec.rb".freeze, "src/ruby/spec/server_credentials_spec.rb".freeze, "src/ruby/spec/spec_helper.rb".freeze, "src/ruby/spec/error_sanity_spec.rb".freeze, "src/ruby/spec/channel_credentials_spec.rb".freeze, "src/ruby/spec/call_credentials_spec.rb".freeze]
+
+ if s.respond_to? :specification_version then
+ s.specification_version = 4
+
+ if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+ s.add_runtime_dependency(%q<google-protobuf>.freeze, ["~> 3.1"])
+ s.add_runtime_dependency(%q<googleauth>.freeze, ["~> 0.5.1"])
+ s.add_development_dependency(%q<bundler>.freeze, ["~> 1.9"])
+ s.add_development_dependency(%q<facter>.freeze, ["~> 2.4"])
+ s.add_development_dependency(%q<logging>.freeze, ["~> 2.0"])
+ s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.9"])
+ s.add_development_dependency(%q<rake>.freeze, ["~> 10.4"])
+ s.add_development_dependency(%q<rake-compiler>.freeze, ["~> 1.0"])
+ s.add_development_dependency(%q<rake-compiler-dock>.freeze, ["~> 0.5.1"])
+ s.add_development_dependency(%q<rspec>.freeze, ["~> 3.2"])
+ s.add_development_dependency(%q<rubocop>.freeze, ["~> 0.30.0"])
+ s.add_development_dependency(%q<signet>.freeze, ["~> 0.7.0"])
+ else
+ s.add_dependency(%q<google-protobuf>.freeze, ["~> 3.1"])
+ s.add_dependency(%q<googleauth>.freeze, ["~> 0.5.1"])
+ s.add_dependency(%q<bundler>.freeze, ["~> 1.9"])
+ s.add_dependency(%q<facter>.freeze, ["~> 2.4"])
+ s.add_dependency(%q<logging>.freeze, ["~> 2.0"])
+ s.add_dependency(%q<simplecov>.freeze, ["~> 0.9"])
+ s.add_dependency(%q<rake>.freeze, ["~> 10.4"])
+ s.add_dependency(%q<rake-compiler>.freeze, ["~> 1.0"])
+ s.add_dependency(%q<rake-compiler-dock>.freeze, ["~> 0.5.1"])
+ s.add_dependency(%q<rspec>.freeze, ["~> 3.2"])
+ s.add_dependency(%q<rubocop>.freeze, ["~> 0.30.0"])
+ s.add_dependency(%q<signet>.freeze, ["~> 0.7.0"])
+ end
+ else
+ s.add_dependency(%q<google-protobuf>.freeze, ["~> 3.1"])
+ s.add_dependency(%q<googleauth>.freeze, ["~> 0.5.1"])
+ s.add_dependency(%q<bundler>.freeze, ["~> 1.9"])
+ s.add_dependency(%q<facter>.freeze, ["~> 2.4"])
+ s.add_dependency(%q<logging>.freeze, ["~> 2.0"])
+ s.add_dependency(%q<simplecov>.freeze, ["~> 0.9"])
+ s.add_dependency(%q<rake>.freeze, ["~> 10.4"])
+ s.add_dependency(%q<rake-compiler>.freeze, ["~> 1.0"])
+ s.add_dependency(%q<rake-compiler-dock>.freeze, ["~> 0.5.1"])
+ s.add_dependency(%q<rspec>.freeze, ["~> 3.2"])
+ s.add_dependency(%q<rubocop>.freeze, ["~> 0.30.0"])
+ s.add_dependency(%q<signet>.freeze, ["~> 0.7.0"])
+ end
+end
+
Property changes on: net/rubygem-grpc/files/grpc.gemspec
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb
===================================================================
--- net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb (nonexistent)
+++ net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb (working copy)
@@ -0,0 +1,41 @@
+--- src/ruby/ext/grpc/extconf.rb.orig 2017-06-28 17:25:39 UTC
++++ src/ruby/ext/grpc/extconf.rb
+@@ -70,9 +70,9 @@ ENV['LD'] = ENV['CC']
+
+ ENV['AR'] = 'libtool -o' if RUBY_PLATFORM =~ /darwin/
+
+-ENV['EMBED_OPENSSL'] = 'true'
+-ENV['EMBED_ZLIB'] = 'true'
+-ENV['EMBED_CARES'] = 'true'
++ENV['EMBED_OPENSSL'] = 'false'
++ENV['EMBED_ZLIB'] = 'false'
++ENV['EMBED_CARES'] = 'false'
+ ENV['ARCH_FLAGS'] = RbConfig::CONFIG['ARCH_FLAG']
+ ENV['ARCH_FLAGS'] = '-arch i386 -arch x86_64' if RUBY_PLATFORM =~ /darwin/
+ ENV['CFLAGS'] = '-DGPR_BACKWARDS_COMPATIBILITY_MODE'
+@@ -81,16 +81,16 @@ output_dir = File.expand_path(RbConfig::CONFIG['topdir
+ grpc_lib_dir = File.join(output_dir, 'libs', grpc_config)
+ ENV['BUILDDIR'] = output_dir
+
+-unless windows
+- puts 'Building internal gRPC into ' + grpc_lib_dir
+- nproc = 4
+- nproc = Etc.nprocessors * 2 if Etc.respond_to? :nprocessors
+- system("make -j#{nproc} -C #{grpc_root} #{grpc_lib_dir}/libgrpc.a CONFIG=#{grpc_config} Q=")
+- exit 1 unless $? == 0
+-end
++#unless windows
++# puts 'Building internal gRPC into ' + grpc_lib_dir
++# puts("gmake -C #{grpc_root} #{grpc_lib_dir}/libgrpc.a CONFIG=#{grpc_config} Q=")
++# system("gmake -C #{grpc_root} #{grpc_lib_dir}/libgrpc.a CONFIG=#{grpc_config} Q=")
++# exit 1 unless $? == 0
++#end
+
+-$CFLAGS << ' -I' + File.join(grpc_root, 'include')
+-$LDFLAGS << ' ' + File.join(grpc_lib_dir, 'libgrpc.a') unless windows
++#$CFLAGS << ' -I' + File.join(grpc_root, 'include')
++#$LDFLAGS << ' ' + File.join(grpc_lib_dir, 'libgrpc.a') unless windows
++$LDFLAGS << ' -lgrpc' unless windows
+ if grpc_config == 'gcov'
+ $CFLAGS << ' -O0 -fprofile-arcs -ftest-coverage'
+ $LDFLAGS << ' -fprofile-arcs -ftest-coverage -rdynamic'
Property changes on: net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: net/rubygem-grpc/files/patch-src_ruby_lib_grpc.rb
===================================================================
--- net/rubygem-grpc/files/patch-src_ruby_lib_grpc.rb (nonexistent)
+++ net/rubygem-grpc/files/patch-src_ruby_lib_grpc.rb (working copy)
@@ -0,0 +1,11 @@
+--- src/ruby/lib/grpc.rb.orig 2017-06-28 17:25:39 UTC
++++ src/ruby/lib/grpc.rb
+@@ -27,7 +27,7 @@
+ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+-ssl_roots_path = File.expand_path('../../../../etc/roots.pem', __FILE__)
++ssl_roots_path = '/usr/local/etc/ssl/cert.pem'
+
+ require_relative 'grpc/errors'
+ require_relative 'grpc/grpc'
Property changes on: net/rubygem-grpc/files/patch-src_ruby_lib_grpc.rb
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: net/rubygem-grpc/pkg-descr
===================================================================
--- net/rubygem-grpc/pkg-descr (nonexistent)
+++ net/rubygem-grpc/pkg-descr (working copy)
@@ -0,0 +1,3 @@
+A Ruby implementation of gRPC.
+
+WWW: https://github.com/grpc/grpc/tree/master/src/ruby
Property changes on: net/rubygem-grpc/pkg-descr
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: devel/grpc/Makefile
===================================================================
--- devel/grpc/Makefile (revision 444576)
+++ devel/grpc/Makefile (working copy)
@@ -3,6 +3,7 @@
PORTNAME= grpc
PORTVERSION= 1.4.0
+PORTREVISION= 1
DISTVERSIONPREFIX= v
CATEGORIES= devel
@@ -12,17 +13,20 @@
LICENSE= BSD3CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= go:lang/go
+BUILD_DEPENDS= go:lang/go \
+ boringssl>=0:security/boringssl
+RUN_DEPENDS= boringssl>=0:security/boringssl
LIB_DEPENDS= libgflags.so:devel/gflags \
libprotobuf.so:devel/protobuf \
libcares.so:dns/c-ares
+LDFLAGS+= -Wl,-rpath,${PREFIX}/lib
+
USE_GITHUB= yes
GH_TUPLE= grpc:grpc:v${PORTVERSION} \
- boringssl:boringssl:ebcb5be:boringssl/third_party/boringssl \
google:benchmark:v1.1.0:benchmark/third_party/benchmark
-USES= cmake perl5 pkgconfig
+USES= cmake localbase perl5 pkgconfig
USE_LDCONFIG= yes
USE_PERL5= build
PLIST_SUB+= SOVERSION=${PORTVERSION}
@@ -31,7 +35,7 @@
CMAKE_ARGS= -DgRPC_ZLIB_PROVIDER:STRING="package" \
-DgRPC_PROTOBUF_PROVIDER:STRING="package" \
-DgRPC_GFLAGS_PROVIDER:STRING="package" \
- -DgRPC_SSL_PROVIDER:STRING="module" \
+ -DgRPC_SSL_PROVIDER:STRING="package" \
-DgRPC_CARES_PROVIDER:STRING="package" \
-DgRPC_BENCHMARK_PROVIDER:STRING="module" \
-DBENCHMARK_USE_LIBCXX=ON \
Index: devel/grpc/files/patch-third__party_boringssl_crypto_CMakeLists.txt
===================================================================
--- devel/grpc/files/patch-third__party_boringssl_crypto_CMakeLists.txt (revision 444576)
+++ devel/grpc/files/patch-third__party_boringssl_crypto_CMakeLists.txt (nonexistent)
@@ -1,32 +0,0 @@
---- third_party/boringssl/crypto/CMakeLists.txt.orig 2017-03-30 20:04:23 UTC
-+++ third_party/boringssl/crypto/CMakeLists.txt
-@@ -195,29 +195,3 @@ add_executable(
-
- target_link_libraries(refcount_test crypto)
- add_dependencies(all_tests refcount_test)
--
--# TODO(davidben): Convert the remaining tests to GTest.
--add_executable(
-- crypto_test
--
-- asn1/asn1_test.cc
-- bio/bio_test.cc
-- chacha/chacha_test.cc
-- constant_time_test.cc
-- curve25519/x25519_test.cc
-- dh/dh_test.cc
-- dsa/dsa_test.cc
-- ec/ec_test.cc
-- err/err_test.cc
-- evp/evp_extra_test.cc
-- rsa/rsa_test.cc
--
-- $<TARGET_OBJECTS:gtest_main>
-- $<TARGET_OBJECTS:test_support>
--)
--
--target_link_libraries(crypto_test crypto gtest)
--if (WIN32)
-- target_link_libraries(crypto_test ws2_32)
--endif()
--add_dependencies(all_tests crypto_test)
Property changes on: devel/grpc/files/patch-third__party_boringssl_crypto_CMakeLists.txt
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
signature.asc
Description: OpenPGP digital signature
