diff options
| author | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2021-02-06 01:22:51 +0000 |
|---|---|---|
| committer | Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2021-02-06 01:22:51 +0000 |
| commit | d3932e0e48c406d330a616f878aa00dda17208f3 (patch) | |
| tree | 90dbead29c360119d4553099a4605e3dd437733b /net/rubygem-grpc130/files/patch-src_ruby_ext_grpc_extconf.rb | |
| parent | Document new vulnerability in www/chromium < 88.0.4324.150 (diff) | |
Fix grpc issue in gitlab-ce
- While I'm here, use = instead of ?= because gitlab-ce does not have slave port
- Bump PORTREVISION for dependency change
gitlab-ce has some runtime issue with grpc versions, especially upb stuff.
Move all gitlab-ce dependencies to specific grpc/rubygem-grpc versions in order
to keep gitlab-ce port more robust.
The changes are as follows:
- Add devel/grpc134 (copied from devel/grpc)
- Add net/rubygem-grpc130 (copied from net/rubygem-grpc)
- Move gitlab-ce and its dependencies to grpc134 and rubygem-grpc130
Differential Revision: https://reviews.freebsd.org/D28491
Submitted by: sunpoet (myself)
Approved by: mfechner
Tested by: mfechner
Diffstat (limited to 'net/rubygem-grpc130/files/patch-src_ruby_ext_grpc_extconf.rb')
| -rw-r--r-- | net/rubygem-grpc130/files/patch-src_ruby_ext_grpc_extconf.rb | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/net/rubygem-grpc130/files/patch-src_ruby_ext_grpc_extconf.rb b/net/rubygem-grpc130/files/patch-src_ruby_ext_grpc_extconf.rb new file mode 100644 index 000000000000..1c9f7cb9dbe2 --- /dev/null +++ b/net/rubygem-grpc130/files/patch-src_ruby_ext_grpc_extconf.rb @@ -0,0 +1,51 @@ +--- src/ruby/ext/grpc/extconf.rb.orig 2019-11-22 13:44:33 UTC ++++ src/ruby/ext/grpc/extconf.rb +@@ -39,9 +39,9 @@ end + + 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['CPPFLAGS'] = '-DGPR_BACKWARDS_COMPATIBILITY_MODE' +@@ -50,22 +50,23 @@ 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 +- make = bsd ? 'gmake' : 'make' +- 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 ++# nproc = 4 ++# nproc = Etc.nprocessors * 2 if Etc.respond_to? :nprocessors ++# make = bsd ? 'gmake' : 'make' ++# system("#{make} -j#{nproc} -C #{grpc_root} #{grpc_lib_dir}/libgrpc.a CONFIG=#{grpc_config} Q=") ++# exit 1 unless $? == 0 ++#end + +-$CFLAGS << ' -I' + File.join(grpc_root, 'include') ++#$CFLAGS << ' -I' + File.join(grpc_root, 'include') + + ext_export_file = File.join(grpc_root, 'src', 'ruby', 'ext', 'grpc', 'ext-export') +-$LDFLAGS << ' -Wl,--version-script="' + ext_export_file + '.gcc"' if RUBY_PLATFORM =~ /linux/ +-$LDFLAGS << ' -Wl,-exported_symbols_list,"' + ext_export_file + '.clang"' if RUBY_PLATFORM =~ /darwin/ ++#$LDFLAGS << ' -Wl,--version-script="' + ext_export_file + '.gcc"' if RUBY_PLATFORM =~ /linux/ ++#$LDFLAGS << ' -Wl,-exported_symbols_list,"' + ext_export_file + '.clang"' if RUBY_PLATFORM =~ /darwin/ ++$LDFLAGS << ' -lgrpc' unless windows + +-$LDFLAGS << ' ' + File.join(grpc_lib_dir, 'libgrpc.a') unless windows ++#$LDFLAGS << ' ' + File.join(grpc_lib_dir, 'libgrpc.a') unless windows + if grpc_config == 'gcov' + $CFLAGS << ' -O0 -fprofile-arcs -ftest-coverage' + $LDFLAGS << ' -fprofile-arcs -ftest-coverage -rdynamic' |