diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2024-08-01 13:31:23 +0900 |
|---|---|---|
| committer | nagachika <nagachika@ruby-lang.org> | 2024-08-06 18:59:52 +0900 |
| commit | 16f795b5e9321088c1ba765e0dfe4a8300fc18ad (patch) | |
| tree | e84a39c2a535215717b3bd7bce766d7669ddc036 | |
| parent | 06cfabd49a1be9c00f2cb7d477cde6d47c3b8d32 (diff) | |
Reapply "merge revision(s) 9f708d48f6df37ee9600db9d51b57a156609a13b,0301473fb523c71d8cdc4966971f31f502001185,7f0e26b7f99bf76408569892ce20318501f74729: [Backport #20516]"
This reverts commit 367ad5055c3d5210c884d4611e08ffa32ec608ee.
| -rw-r--r-- | tool/lib/bundled_gem.rb | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tool/lib/bundled_gem.rb b/tool/lib/bundled_gem.rb index 38c331183d..6633d3e0c4 100644 --- a/tool/lib/bundled_gem.rb +++ b/tool/lib/bundled_gem.rb @@ -6,6 +6,16 @@ require 'rubygems/package' # unpack bundled gem files. module BundledGem + DEFAULT_GEMS_DEPENDENCIES = [ + "net-protocol", # net-ftp + "time", # net-ftp + "singleton", # prime + "ipaddr", # rinda + "forwardable", # prime, rinda + "ruby2_keywords", # drb + "strscan" # rexml + ] + module_function def unpack(file, *rest) @@ -35,6 +45,9 @@ module BundledGem gem_dir = File.join(dir, "gems", target) yield gem_dir spec_dir = spec.extensions.empty? ? "specifications" : File.join("gems", target) + if spec.extensions.empty? + spec.dependencies.reject! {|dep| DEFAULT_GEMS_DEPENDENCIES.include?(dep.name)} + end File.binwrite(File.join(dir, spec_dir, "#{target}.gemspec"), spec.to_ruby) unless spec.extensions.empty? spec.dependencies.clear |