Merge pull request #1631 from chef/IPACK-184-update-omnibus-software-…

…google-protobuf-to-v-3-20-1 update google-protobuf to 3.20.1
chef · May 5, 2022 · 40596b5 · 40596b5
2 parents 88438e8 + 31df834
commit 40596b5
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/config/software/google-protobuf.rb b/config/software/google-protobuf.rb
@@ -21,7 +21,7 @@
 # with the gem.
 
 name "google-protobuf"
-default_version "v3.19.1"
+default_version "v3.20.1"
 
 dependency "ruby"
 
@@ -32,7 +32,14 @@
 license :project_license
 
 build do
+  mkdir "#{project_dir}/ruby/ext/google/protobuf_c/third_party/utf8_range"
+  copy "#{project_dir}/third_party/utf8_range/utf8_range.h",  "#{project_dir}/ruby/ext/google/protobuf_c/third_party/utf8_range"
+  copy "#{project_dir}/third_party/utf8_range/naive.c",       "#{project_dir}/ruby/ext/google/protobuf_c/third_party/utf8_range"
+  copy "#{project_dir}/third_party/utf8_range/range2-neon.c", "#{project_dir}/ruby/ext/google/protobuf_c/third_party/utf8_range"
+  copy "#{project_dir}/third_party/utf8_range/range2-sse.c",  "#{project_dir}/ruby/ext/google/protobuf_c/third_party/utf8_range"
+  copy "#{project_dir}/third_party/utf8_range/LICENSE",       "#{project_dir}/ruby/ext/google/protobuf_c/third_party/utf8_range"
+
   env = with_standard_compiler_flags(with_embedded_path)
   gem "build google-protobuf.gemspec", env: env, cwd: "#{project_dir}/ruby"
   gem "install google-protobuf-*.gem", env: env, cwd: "#{project_dir}/ruby"
-end
+end