diff options
author | Dan Theisen <djt@hxx.in> | 2019-05-02 11:25:17 +0000 |
---|---|---|
committer | Dan Theisen <djt@hxx.in> | 2019-05-03 11:26:29 +0000 |
commit | a27b138fbd3237082a94daa5e8a987b7a857cef9 (patch) | |
tree | 474d850ee02e50ec984ee7047ccc41461b161731 /user/protobuf/trim-rakefile.patch | |
parent | 5917e35623a029af69bbc007c298d67460d6270e (diff) | |
download | packages-a27b138fbd3237082a94daa5e8a987b7a857cef9.tar.gz packages-a27b138fbd3237082a94daa5e8a987b7a857cef9.tar.bz2 packages-a27b138fbd3237082a94daa5e8a987b7a857cef9.tar.xz packages-a27b138fbd3237082a94daa5e8a987b7a857cef9.zip |
user/protobuf: bump to 3.7.1
Diffstat (limited to 'user/protobuf/trim-rakefile.patch')
-rw-r--r-- | user/protobuf/trim-rakefile.patch | 72 |
1 files changed, 0 insertions, 72 deletions
diff --git a/user/protobuf/trim-rakefile.patch b/user/protobuf/trim-rakefile.patch deleted file mode 100644 index 7f53d7099..000000000 --- a/user/protobuf/trim-rakefile.patch +++ /dev/null @@ -1,72 +0,0 @@ -Remove code that we don't use to avoid installing additional dependencies. ---- a/ruby/Rakefile -+++ b/ruby/Rakefile -@@ -1,6 +1,4 @@ - require "rubygems" --require "rubygems/package_task" --require "rake/extensiontask" unless RUBY_PLATFORM == "java" - require "rake/testtask" - - spec = Gem::Specification.load("google-protobuf.gemspec") -@@ -39,51 +37,6 @@ - end - end - --if RUBY_PLATFORM == "java" -- if `which mvn` == '' -- raise ArgumentError, "maven needs to be installed" -- end -- task :clean do -- system("mvn --batch-mode clean") -- end -- -- task :compile do -- system("mvn --batch-mode package") -- end --else -- Rake::ExtensionTask.new("protobuf_c", spec) do |ext| -- unless RUBY_PLATFORM =~ /darwin/ -- # TODO: also set "no_native to true" for mac if possible. As is, -- # "no_native" can only be set if the RUBY_PLATFORM doing -- # cross-compilation is contained in the "ext.cross_platform" array. -- ext.no_native = true -- end -- ext.ext_dir = "ext/google/protobuf_c" -- ext.lib_dir = "lib/google" -- ext.cross_compile = true -- ext.cross_platform = [ -- 'x86-mingw32', 'x64-mingw32', -- 'x86_64-linux', 'x86-linux', -- 'universal-darwin' -- ] -- end -- -- task 'gem:windows' do -- require 'rake_compiler_dock' -- RakeCompilerDock.sh "bundle && IN_DOCKER=true rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0:2.2.2:2.1.6:2.0.0" -- end -- -- if RUBY_PLATFORM =~ /darwin/ -- task 'gem:native' do -- system "rake genproto" -- system "rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0:2.2.2:2.1.6:2.0.0" -- end -- else -- task 'gem:native' => [:genproto, 'gem:windows'] -- end --end -- -- - # Proto for tests. - genproto_output << "tests/generated_code.rb" - genproto_output << "tests/test_import.rb" -@@ -104,9 +57,6 @@ - - task :clean do - sh "rm -f #{genproto_output.join(' ')}" --end -- --Gem::PackageTask.new(spec) do |pkg| - end - - Rake::TestTask.new(:test => :build) do |t| |