From: Laszlo Boszormenyi (GCS) Date: Fri, 24 Jul 2020 15:28:01 +0000 (+0100) Subject: no-make-in-extconf X-Git-Tag: archive/raspbian/1.30.2-2.1+rpi1~1^2~5 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ca7a21da35365f40e6ab1c8f26de11c3f0440b84;p=grpc.git no-make-in-extconf Gbp-Pq: Name no-make-in-extconf.patch --- diff --git a/src/ruby/ext/grpc/extconf.rb b/src/ruby/ext/grpc/extconf.rb index 1483a425..1d0cf7d9 100644 --- a/src/ruby/ext/grpc/extconf.rb +++ b/src/ruby/ext/grpc/extconf.rb @@ -50,22 +50,13 @@ 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 - $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 << ' ' + File.join(grpc_lib_dir, 'libgrpc.a') unless windows +$LDFLAGS << ' ' + '-Wl,-wrap,memcpy -lgrpc' unless windows if grpc_config == 'gcov' $CFLAGS << ' -O0 -fprofile-arcs -ftest-coverage' $LDFLAGS << ' -fprofile-arcs -ftest-coverage -rdynamic'