From: Laszlo Boszormenyi (GCS) <gcs@debian.org>
Date: Tue, 27 Nov 2018 16:58:17 +0000 (+0000)
Subject: no-make-in-extconf
X-Git-Tag: archive/raspbian/1.30.2-2.1+rpi1~1^2^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e032abad59d5d5dfb17ad6c4cad8bd95ea61cdc0;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 867339a1..c9fc5c81 100644
--- a/src/ruby/ext/grpc/extconf.rb
+++ b/src/ruby/ext/grpc/extconf.rb
@@ -42,17 +42,8 @@ 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')
-$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'