diff options
| author | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2023-03-21 18:51:59 +0000 |
|---|---|---|
| committer | Po-Chuan Hsieh <sunpoet@FreeBSD.org> | 2023-03-21 19:22:07 +0000 |
| commit | af8f5b478f7deac48306a19868eef596a73bf860 (patch) | |
| tree | 308be66991b8e6dd5bb2d52ac94d23fb961a1cc6 /net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb | |
| parent | 7d9fd36c54763665aa1042a2dc9c942db58d851d (diff) | |
| download | ports-af8f5b478f7deac48306a19868eef596a73bf860.tar.gz ports-af8f5b478f7deac48306a19868eef596a73bf860.zip | |
net/rubygem-grpc: Update to 1.52.0
Diffstat (limited to 'net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb')
| -rw-r--r-- | net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb b/net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb index e9c3881e6c81..c325a069f189 100644 --- a/net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb +++ b/net/rubygem-grpc/files/patch-src_ruby_ext_grpc_extconf.rb @@ -1,11 +1,11 @@ ---- src/ruby/ext/grpc/extconf.rb.orig 2022-07-30 16:45:00 UTC +--- src/ruby/ext/grpc/extconf.rb.orig 2023-02-26 18:56:37 UTC +++ src/ruby/ext/grpc/extconf.rb -@@ -68,11 +68,11 @@ if apple_toolchain && !cross_compiling +@@ -69,11 +69,11 @@ if apple_toolchain && !cross_compiling end # Don't embed on TruffleRuby (constant-time crypto is unsafe with Sulong, slow build times) -ENV['EMBED_OPENSSL'] = (RUBY_ENGINE != 'truffleruby').to_s -+ENV['EMBED_OPENSSL'] = 'false' ++ENV['EMBED_OPENSSL'] = 'false' # Don't embed on TruffleRuby (the system zlib is already linked for the zlib C extension, slow build times) -ENV['EMBED_ZLIB'] = (RUBY_ENGINE != 'truffleruby').to_s +ENV['EMBED_ZLIB'] = 'false' @@ -15,7 +15,7 @@ ENV['ARCH_FLAGS'] = RbConfig::CONFIG['ARCH_FLAG'] if apple_toolchain && !cross_compiling -@@ -93,30 +93,10 @@ output_dir = File.expand_path(RbConfig::CONFIG['topdir +@@ -94,25 +94,6 @@ output_dir = File.expand_path(RbConfig::CONFIG['topdir grpc_lib_dir = File.join(output_dir, 'libs', grpc_config) ENV['BUILDDIR'] = output_dir @@ -35,10 +35,16 @@ - exit 1 unless $? == 0 -end - +-$CFLAGS << ' -DGRPC_RUBY_WINDOWS_UCRT' if windows_ucrt -$CFLAGS << ' -I' + File.join(grpc_root, 'include') - - ext_export_file = File.join(grpc_root, 'src', 'ruby', 'ext', 'grpc', 'ext-export') - ext_export_file += '-truffleruby' if RUBY_ENGINE == 'truffleruby' + def have_ruby_abi_version() + return true if RUBY_ENGINE == 'truffleruby' + # ruby_abi_version is only available in development versions: https://github.com/ruby/ruby/pull/6231 +@@ -141,10 +122,8 @@ def ext_export_filename() + end + + ext_export_file = File.join(grpc_root, 'src', 'ruby', 'ext', 'grpc', ext_export_filename()) -$LDFLAGS << ' -Wl,--version-script="' + ext_export_file + '.gcc"' if linux -$LDFLAGS << ' -Wl,-exported_symbols_list,"' + ext_export_file + '.clang"' if apple_toolchain |