Skip to content

Commit cb0d1da

Browse files
Fix jruby warnings
On jruby, somehow the $LOAD_PATH is manipulated so that we end up requiring stuff inside the built package even if we have specified the -I flag, so we get redefinition warnings. I'm not sure about the root cause, but relative requiring fixes it, and it's faster anyways.
1 parent c997a4b commit cb0d1da

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

lib/rubygems/command.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#++
77

88
require 'optparse'
9-
require 'rubygems/requirement'
10-
require 'rubygems/user_interaction'
9+
require_relative 'requirement'
10+
require_relative 'user_interaction'
1111

1212
##
1313
# Base class for all Gem commands. When creating a new gem command, define

lib/rubygems/ext.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010

1111
module Gem::Ext; end
1212

13-
require 'rubygems/ext/build_error'
14-
require 'rubygems/ext/builder'
15-
require 'rubygems/ext/configure_builder'
16-
require 'rubygems/ext/ext_conf_builder'
17-
require 'rubygems/ext/rake_builder'
18-
require 'rubygems/ext/cmake_builder'
13+
require_relative 'ext/build_error'
14+
require_relative 'ext/builder'
15+
require_relative 'ext/configure_builder'
16+
require_relative 'ext/ext_conf_builder'
17+
require_relative 'ext/rake_builder'
18+
require_relative 'ext/cmake_builder'

lib/rubygems/ext/build_error.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
##
33
# Raised when there is an error while building extensions.
44

5-
require 'rubygems/exceptions'
5+
require_relative '../exceptions'
66

77
class Gem::Ext::BuildError < Gem::InstallError
88
end

lib/rubygems/ext/builder.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# See LICENSE.txt for permissions.
66
#++
77

8-
require 'rubygems/user_interaction'
8+
require_relative '../user_interaction'
99

1010
class Gem::Ext::Builder
1111

lib/rubygems/ext/cmake_builder.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# frozen_string_literal: true
2-
require 'rubygems/command'
2+
require_relative '../command'
33

44
class Gem::Ext::CmakeBuilder < Gem::Ext::Builder
55

lib/rubygems/specification_policy.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ def validate_removed_attributes # :nodoc:
420420
end
421421

422422
def validate_extensions # :nodoc:
423-
require 'rubygems/ext'
423+
require_relative 'ext'
424424
builder = Gem::Ext::Builder.new(@specification)
425425

426426
rake_extension = @specification.extensions.any? {|s| builder.builder_for(s) == Gem::Ext::RakeBuilder }

0 commit comments

Comments
 (0)