diff options
| author |  Alexander Polcyn <apolcyn@google.com> | 2017-02-08 19:31:45 -0800 |
|---|---|---|
| committer | Alexander Polcyn <apolcyn@google.com> | 2017-02-09 09:10:51 -0800 |
| commit | d490a9e7c3f9e1911167058476addf13d244733a (patch) | |
| tree | 08e971b9c85ce717cc2216878871bcfe68760ca9 | |
| parent | fe9171314e8faeb30098663f9f03f859c6f1def1 (diff) | |
build fixes for ruby on mac
| -rwxr-xr-x | grpc.gemspec | 2 | ||||
| -rw-r--r-- | templates/grpc.gemspec.template | 2 | ||||
| -rw-r--r-- | tools/distrib/build_ruby_environment_macos.sh | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/grpc.gemspec b/grpc.gemspec index 48f7ed6def..e7844f222c 100755 --- a/grpc.gemspec +++ b/grpc.gemspec @@ -35,7 +35,7 @@ Gem::Specification.new do |s| s.add_development_dependency 'logging', '~> 2.0' s.add_development_dependency 'simplecov', '~> 0.9' s.add_development_dependency 'rake', '~> 10.4' - s.add_development_dependency 'rake-compiler', '~> 0.9' + s.add_development_dependency 'rake-compiler', '~> 1.0' s.add_development_dependency 'rake-compiler-dock', '~> 0.5.1' s.add_development_dependency 'rspec', '~> 3.2' s.add_development_dependency 'rubocop', '~> 0.30.0' diff --git a/templates/grpc.gemspec.template b/templates/grpc.gemspec.template index 24446a37d6..462ea52614 100644 --- a/templates/grpc.gemspec.template +++ b/templates/grpc.gemspec.template @@ -37,7 +37,7 @@ s.add_development_dependency 'logging', '~> 2.0' s.add_development_dependency 'simplecov', '~> 0.9' s.add_development_dependency 'rake', '~> 10.4' - s.add_development_dependency 'rake-compiler', '~> 0.9' + s.add_development_dependency 'rake-compiler', '~> 1.0' s.add_development_dependency 'rake-compiler-dock', '~> 0.5.1' s.add_development_dependency 'rspec', '~> 3.2' s.add_development_dependency 'rubocop', '~> 0.30.0' diff --git a/tools/distrib/build_ruby_environment_macos.sh b/tools/distrib/build_ruby_environment_macos.sh index 64fad7c606..0ae589cb0b 100644 --- a/tools/distrib/build_ruby_environment_macos.sh +++ b/tools/distrib/build_ruby_environment_macos.sh @@ -34,7 +34,7 @@ rm -rf ~/.rake-compiler CROSS_RUBY=`mktemp tmpfile.XXXXXXXX` -curl https://raw.githubusercontent.com/rake-compiler/rake-compiler/v0.9.5/tasks/bin/cross-ruby.rake > $CROSS_RUBY +curl https://raw.githubusercontent.com/rake-compiler/rake-compiler/v1.0.3/tasks/bin/cross-ruby.rake > $CROSS_RUBY patch $CROSS_RUBY << EOF --- cross-ruby.rake 2016-02-05 16:26:53.000000000 -0800 @@ -53,7 +53,8 @@ EOF MAKE="make -j8" -for v in 2.3.0 2.2.2 2.1.5 2.0.0-p645 ; do +for v in 2.4.0 2.3.0 2.2.2 2.1.5 2.0.0-p645 ; do + ccache -c rake -f $CROSS_RUBY cross-ruby VERSION=$v HOST=x86_64-darwin11 done |