Attachment #238328 for bug #267979

View | Details | Raw Unified | Return to bug 267979
Collapse All | Expand All

Lines 147-154 RUBY_PORTEPOCH= 1 Link Here

(-)b/Mk/bsd.ruby.mk (-2 / +2 lines)
147	#	147	#
148	# Ruby 3.1	148	# Ruby 3.1
149	#	149	#
150	RUBY_DISTVERSION= 3.1.2	150	RUBY_DISTVERSION= 3.1.3
151	RUBY_PORTREVISION= 2	151	RUBY_PORTREVISION= 0
152	RUBY_PORTEPOCH= 1	152	RUBY_PORTEPOCH= 1
153		153
154	. elif ${RUBY_VER} == 3.2	154	. elif ${RUBY_VER} == 3.2

Lines 1-3 Link Here

(-)b/lang/ruby31/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1649833463	1	TIMESTAMP = 1669322575
2	SHA256 (ruby/ruby-3.1.2.tar.xz) = ca10d017f8a1b6d247556622c841fc56b90c03b1803f87198da1e4fd3ec3bf2a	2	SHA256 (ruby/ruby-3.1.3.tar.xz) = 4ee161939826bcdfdafa757cf8e293a7f14e357f62be7144f040335cc8c7371a
3	SIZE (ruby/ruby-3.1.2.tar.xz) = 15101588	3	SIZE (ruby/ruby-3.1.3.tar.xz) = 15300224




--- tool/rbinstall.rb.orig	2022-11-24 10:20:31 UTC
+++ tool/rbinstall.rb
@@ -930,170 +930,6 @@ end
 
 # :startdoc:
 

-  install_default_gem('ext', srcdir, bindir)
-end
-
-def load_gemspec(file, base = nil)
-  file = File.realpath(file)
-  code = File.read(file, encoding: "utf-8:-")
-  code.gsub!(/(?:`git[^\`]*`|%x\[git[^\]]*\])\.split\([^\)]*\)/m) do
-    files = []
-    if base
-      base = File.dirname(file)
-      Dir.glob("**/*", File::FNM_DOTMATCH, base: base) do |n|
-        case File.basename(n); when ".", ".."; next; end
-        next if File.directory?(File.join(base, n))

-  unless Gem::Specification === spec
-    raise TypeError, "[#{file}] isn't a Gem::Specification (#{spec.class} instead)."
-  end
-  spec.loaded_from = base ? File.join(base, File.basename(file)) : file
-  spec.files.reject! {|n| n.end_with?(".gemspec") or n.start_with?(".git")}
-
-  spec

-end
-
-install?(:ext, :comm, :gem, :'bundled-gems') do
-  if CONFIG['CROSS_COMPILING'] == 'yes'
-    # The following hacky steps set "$ruby = BASERUBY" in tool/fake.rb
-    $hdrdir = ''
-    $extmk = nil
-    $ruby = nil  # ...
-    ruby_path = $ruby + " -I#{Dir.pwd}" # $baseruby + " -I#{Dir.pwd}"
-  else
-    # ruby_path = File.expand_path(with_destdir(File.join(bindir, ruby_install_name)))
-    ENV['RUBYLIB'] = nil
-    ENV['RUBYOPT'] = nil
-    ruby_path = File.expand_path(with_destdir(File.join(bindir, ruby_install_name))) + " --disable=gems -I#{with_destdir(archlibdir)}"
-  end
-  Gem.instance_variable_set(:@ruby, ruby_path) if Gem.ruby != ruby_path
-
-  gem_dir = Gem.default_dir
-  install_dir = with_destdir(gem_dir)
-  prepare "bundled gems", gem_dir

-    :wrappers => true,
-    :format_executable => true,
-  }
-
-  extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir
-  specifications_dir = File.join(gem_dir, "specifications")
-  build_dir = Gem::StubSpecification.gemspec_stub("", ".bundle", ".bundle").extensions_dir
-
-  # We are about to build extensions, and want to configure extensions with the
-  # newly installed ruby.
-  Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name)))
-  # Prevent fake.rb propagation. It conflicts with the natural mkmf configs of
-  # the newly installed ruby.
-  ENV.delete('RUBYOPT')
-
-  File.foreach("#{srcdir}/gems/bundled_gems") do |name|
-    next if /^\s*(?:#|$)/ =~ name
-    next unless /^(\S+)\s+(\S+).*/ =~ name
-    gem_name = "#$1-#$2"
-    path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec"
-    unless File.exist?(path)
-      path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec"
-    else
-      path = "#{srcdir}/.bundle/gems/#{gem_name}/#$1.gemspec"
-      next unless File.exist?(path)
-      spec = load_gemspec(path, true)
-    end
-    spec = load_gemspec(path, "#{srcdir}/.bundle/gems/#{gem_name}")
-    next unless spec.platform == Gem::Platform::RUBY
-    next unless spec.full_name == gem_name
-    if !spec.extensions.empty? && CONFIG["EXTSTATIC"] == "static"
-      puts "skip installation of #{spec.name} #{spec.version}; bundled gem with an extension library is not supported on --with-static-linked-ext"
-      next
-    end
-    spec.extension_dir = "#{extensions_dir}/#{spec.full_name}"
-    if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}")
-      spec.extensions[0] ||= "-"
-    end
-    package = RbInstall::DirPackage.new spec
-    ins = RbInstall::UnpackedInstaller.new(package, options)
-    puts "#{INDENT}#{spec.name} #{spec.version}"
-    ins.install
-    install_recursive("#{build_dir}/#{gem_name}", "#{extensions_dir}/#{gem_name}") do |src, dest|
-      # puts "#{INDENT}    #{dest[extensions_dir.size+gem_name.size+2..-1]}"
-      install src, dest, :mode => (File.executable?(src) ? $prog_mode : $data_mode)
-    unless spec.extensions.empty?
-      install_recursive(ext, spec.extension_dir)
-    end
-    installed_gems[spec.full_name] = true
-  end

-  end
-  next if gems.empty?
-  if defined?(Zlib)
-    Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name)))
-    silent = Gem::SilentUI.new
-    gems.each do |gem|
-      package = Gem::Package.new(gem)

Return to bug 267979

Lines 1-6 Link Here

(-)b/lang/ruby31/files/patch-tool_rbinstall.rb (-41 / +23 lines)
1	--- tool/rbinstall.rb.orig 2021-12-25 12:23:14 UTC	1	--- tool/rbinstall.rb.orig 2022-11-24 10:20:31 UTC
2	+++ tool/rbinstall.rb	2	+++ tool/rbinstall.rb
3	@@ -923,188 +923,6 @@ end	3	@@ -930,170 +930,6 @@ end
4		4
5	# :startdoc:	5	# :startdoc:
6		6
Lines 11-23 Link Here
11	- install_default_gem('ext', srcdir, bindir)	11	- install_default_gem('ext', srcdir, bindir)
12	-end	12	-end
13	-	13	-
14	-def load_gemspec(file, expanded = false)	14	-def load_gemspec(file, base = nil)
15	- file = File.realpath(file)	15	- file = File.realpath(file)
16	- code = File.read(file, encoding: "utf-8:-")	16	- code = File.read(file, encoding: "utf-8:-")
17	- code.gsub!(/(?:`git[^\`]`\|%x\[git[^\]]\])\.split\([^\)]*\)/m) do	17	- code.gsub!(/(?:`git[^\`]`\|%x\[git[^\]]\])\.split\([^\)]*\)/m) do
18	- files = []	18	- files = []
19	- if expanded	19	- if base
20	- base = File.dirname(file)
21	- Dir.glob("*/", File::FNM_DOTMATCH, base: base) do \|n\|	20	- Dir.glob("*/", File::FNM_DOTMATCH, base: base) do \|n\|
22	- case File.basename(n); when ".", ".."; next; end	21	- case File.basename(n); when ".", ".."; next; end
23	- next if File.directory?(File.join(base, n))	22	- next if File.directory?(File.join(base, n))
Lines 30-36 Link Here
30	- unless Gem::Specification === spec	29	- unless Gem::Specification === spec
31	- raise TypeError, "[#{file}] isn't a Gem::Specification (#{spec.class} instead)."	30	- raise TypeError, "[#{file}] isn't a Gem::Specification (#{spec.class} instead)."
32	- end	31	- end
33	- spec.loaded_from = file	32	- spec.loaded_from = base ? File.join(base, File.basename(file)) : file
34	- spec.files.reject! {\|n\| n.end_with?(".gemspec") or n.start_with?(".git")}	33	- spec.files.reject! {\|n\| n.end_with?(".gemspec") or n.start_with?(".git")}
35	-	34	-
36	- spec	35	- spec
Lines 85-104 Link Here
85	-end	84	-end
86	-	85	-
87	-install?(:ext, :comm, :gem, :'bundled-gems') do	86	-install?(:ext, :comm, :gem, :'bundled-gems') do
88	- if CONFIG['CROSS_COMPILING'] == 'yes'
89	- # The following hacky steps set "$ruby = BASERUBY" in tool/fake.rb
90	- $hdrdir = ''
91	- $extmk = nil
92	- $ruby = nil # ...
93	- ruby_path = $ruby + " -I#{Dir.pwd}" # $baseruby + " -I#{Dir.pwd}"
94	- else
95	- # ruby_path = File.expand_path(with_destdir(File.join(bindir, ruby_install_name)))
96	- ENV['RUBYLIB'] = nil
97	- ENV['RUBYOPT'] = nil
98	- ruby_path = File.expand_path(with_destdir(File.join(bindir, ruby_install_name))) + " --disable=gems -I#{with_destdir(archlibdir)}"
99	- end
100	- Gem.instance_variable_set(:@ruby, ruby_path) if Gem.ruby != ruby_path
101	-
102	- gem_dir = Gem.default_dir	87	- gem_dir = Gem.default_dir
103	- install_dir = with_destdir(gem_dir)	88	- install_dir = with_destdir(gem_dir)
104	- prepare "bundled gems", gem_dir	89	- prepare "bundled gems", gem_dir
Lines 118-157 Link Here
118	- :wrappers => true,	103	- :wrappers => true,
119	- :format_executable => true,	104	- :format_executable => true,
120	- }	105	- }
121	- gem_ext_dir = "#$extout/gems/#{CONFIG['arch']}"	106	-
122	- extensions_dir = with_destdir(Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir)	107	- extensions_dir = Gem::StubSpecification.gemspec_stub("", gem_dir, gem_dir).extensions_dir
		108	- specifications_dir = File.join(gem_dir, "specifications")
		109	- build_dir = Gem::StubSpecification.gemspec_stub("", ".bundle", ".bundle").extensions_dir
		110	-
		111	- # We are about to build extensions, and want to configure extensions with the
		112	- # newly installed ruby.
		113	- Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name)))
		114	- # Prevent fake.rb propagation. It conflicts with the natural mkmf configs of
		115	- # the newly installed ruby.
		116	- ENV.delete('RUBYOPT')
123	-	117	-
124	- File.foreach("#{srcdir}/gems/bundled_gems") do \|name\|	118	- File.foreach("#{srcdir}/gems/bundled_gems") do \|name\|
125	- next if /^\s*(?:#\|$)/ =~ name	119	- next if /^\s*(?:#\|$)/ =~ name
126	- next unless /^(\S+)\s+(\S+).*/ =~ name	120	- next unless /^(\S+)\s+(\S+).*/ =~ name
127	- gem_name = "#$1-#$2"	121	- gem_name = "#$1-#$2"
128	- path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec"	122	- path = "#{srcdir}/.bundle/specifications/#{gem_name}.gemspec"
129	- if File.exist?(path)	123	- unless File.exist?(path)
130	- spec = load_gemspec(path)	124	- path = "#{srcdir}/.bundle/gems/#{gem_name}/#{gem_name}.gemspec"
131	- else
132	- path = "#{srcdir}/.bundle/gems/#{gem_name}/#$1.gemspec"
133	- next unless File.exist?(path)	125	- next unless File.exist?(path)
134	- spec = load_gemspec(path, true)
135	- end	126	- end
		127	- spec = load_gemspec(path, "#{srcdir}/.bundle/gems/#{gem_name}")
136	- next unless spec.platform == Gem::Platform::RUBY	128	- next unless spec.platform == Gem::Platform::RUBY
137	- next unless spec.full_name == gem_name	129	- next unless spec.full_name == gem_name
138	- if !spec.extensions.empty? && CONFIG["EXTSTATIC"] == "static"
139	- puts "skip installation of #{spec.name} #{spec.version}; bundled gem with an extension library is not supported on --with-static-linked-ext"
140	- next
141	- end
142	- spec.extension_dir = "#{extensions_dir}/#{spec.full_name}"	130	- spec.extension_dir = "#{extensions_dir}/#{spec.full_name}"
143	- if File.directory?(ext = "#{gem_ext_dir}/#{spec.full_name}")
144	- spec.extensions[0] \|\|= "-"
145	- end
146	- package = RbInstall::DirPackage.new spec	131	- package = RbInstall::DirPackage.new spec
147	- ins = RbInstall::UnpackedInstaller.new(package, options)	132	- ins = RbInstall::UnpackedInstaller.new(package, options)
148	- puts "#{INDENT}#{spec.name} #{spec.version}"	133	- puts "#{INDENT}#{spec.name} #{spec.version}"
149	- ins.install	134	- ins.install
150	- unless $dryrun	135	- install_recursive("#{build_dir}/#{gem_name}", "#{extensions_dir}/#{gem_name}") do \|src, dest\|
151	- File.chmod($data_mode, File.join(install_dir, "specifications", "#{spec.full_name}.gemspec"))	136	- # puts "#{INDENT} #{dest[extensions_dir.size+gem_name.size+2..-1]}"
152	- end	137	- install src, dest, :mode => (File.executable?(src) ? $prog_mode : $data_mode)
153	- unless spec.extensions.empty?
154	- install_recursive(ext, spec.extension_dir)
155	- end	138	- end
156	- installed_gems[spec.full_name] = true	139	- installed_gems[spec.full_name] = true
157	- end	140	- end
Lines 162-168 Link Here
162	- end	145	- end
163	- next if gems.empty?	146	- next if gems.empty?
164	- if defined?(Zlib)	147	- if defined?(Zlib)
165	- Gem.instance_variable_set(:@ruby, with_destdir(File.join(bindir, ruby_install_name)))
166	- silent = Gem::SilentUI.new	148	- silent = Gem::SilentUI.new
167	- gems.each do \|gem\|	149	- gems.each do \|gem\|
168	- package = Gem::Package.new(gem)	150	- package = Gem::Package.new(gem)

Lines 823-828 lib/libruby%%RUBY_SHLIBVER%%.so.%%RUBY_SHLIBVER%% Link Here

(-)b/lang/ruby31/pkg-plist (-22 / +96 lines)
823	%%RUBY_LIBDIR%%/rubygems/ext.rb	823	%%RUBY_LIBDIR%%/rubygems/ext.rb
824	%%RUBY_LIBDIR%%/rubygems/ext/build_error.rb	824	%%RUBY_LIBDIR%%/rubygems/ext/build_error.rb
825	%%RUBY_LIBDIR%%/rubygems/ext/builder.rb	825	%%RUBY_LIBDIR%%/rubygems/ext/builder.rb
		826	%%RUBY_LIBDIR%%/rubygems/ext/cargo_builder.rb
		827	%%RUBY_LIBDIR%%/rubygems/ext/cargo_builder/link_flag_converter.rb
826	%%RUBY_LIBDIR%%/rubygems/ext/cmake_builder.rb	828	%%RUBY_LIBDIR%%/rubygems/ext/cmake_builder.rb
827	%%RUBY_LIBDIR%%/rubygems/ext/configure_builder.rb	829	%%RUBY_LIBDIR%%/rubygems/ext/configure_builder.rb
828	%%RUBY_LIBDIR%%/rubygems/ext/ext_conf_builder.rb	830	%%RUBY_LIBDIR%%/rubygems/ext/ext_conf_builder.rb
Lines 862-868 lib/libruby%%RUBY_SHLIBVER%%.so.%%RUBY_SHLIBVER%% Link Here
862	%%RUBY_LIBDIR%%/rubygems/package_task.rb	864	%%RUBY_LIBDIR%%/rubygems/package_task.rb
863	%%RUBY_LIBDIR%%/rubygems/path_support.rb	865	%%RUBY_LIBDIR%%/rubygems/path_support.rb
864	%%RUBY_LIBDIR%%/rubygems/platform.rb	866	%%RUBY_LIBDIR%%/rubygems/platform.rb
865	%%RUBY_LIBDIR%%/rubygems/psych_additions.rb
866	%%RUBY_LIBDIR%%/rubygems/psych_tree.rb	867	%%RUBY_LIBDIR%%/rubygems/psych_tree.rb
867	%%RUBY_LIBDIR%%/rubygems/query_utils.rb	868	%%RUBY_LIBDIR%%/rubygems/query_utils.rb
868	%%RUBY_LIBDIR%%/rubygems/rdoc.rb	869	%%RUBY_LIBDIR%%/rubygems/rdoc.rb
Lines 1756-1769 man/man1/ruby%%RUBY_SUFFIX%%.1.gz Link Here
1756	%%RDOC%%%%RUBY_RIDIR%%/Binding/receiver-i.ri	1757	%%RDOC%%%%RUBY_RIDIR%%/Binding/receiver-i.ri
1757	%%RDOC%%%%RUBY_RIDIR%%/Binding/source_location-i.ri	1758	%%RDOC%%%%RUBY_RIDIR%%/Binding/source_location-i.ri
1758	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/cdesc-Cookie.ri	1759	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/cdesc-Cookie.ri
		1760	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/domain%3d-i.ri
1759	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/domain-i.ri	1761	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/domain-i.ri
1760	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/expires-i.ri	1762	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/expires-i.ri
1761	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/httponly%3d-i.ri	1763	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/httponly%3d-i.ri
1762	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/httponly-i.ri	1764	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/httponly-i.ri
1763	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/inspect-i.ri	1765	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/inspect-i.ri
		1766	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/name%3d-i.ri
1764	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/name-i.ri	1767	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/name-i.ri
1765	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/new-c.ri	1768	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/new-c.ri
1766	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/parse-c.ri	1769	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/parse-c.ri
		1770	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/path%3d-i.ri
1767	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/path-i.ri	1771	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/path-i.ri
1768	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/secure%3d-i.ri	1772	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/secure%3d-i.ri
1769	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/secure-i.ri	1773	%%RDOC%%%%RUBY_RIDIR%%/CGI/Cookie/secure-i.ri
Lines 1773-1780 man/man1/ruby%%RUBY_SUFFIX%%.1.gz Link Here
1773	%%RDOC%%%%RUBY_RIDIR%%/CGI/Escape/cdesc-Escape.ri	1777	%%RDOC%%%%RUBY_RIDIR%%/CGI/Escape/cdesc-Escape.ri
1774	%%RDOC%%%%RUBY_RIDIR%%/CGI/Escape/escape-i.ri	1778	%%RDOC%%%%RUBY_RIDIR%%/CGI/Escape/escape-i.ri
1775	%%RDOC%%%%RUBY_RIDIR%%/CGI/Escape/escapeHTML-i.ri	1779	%%RDOC%%%%RUBY_RIDIR%%/CGI/Escape/escapeHTML-i.ri