|
| 1 | +From: Sorah Fukumori <her@sorah.jp> |
| 2 | +Date: Thu, 26 Dec 2024 18:07:53 +0900 |
| 3 | +Subject: rbinstall: Disable arch-dependent file isolation |
| 4 | + |
| 5 | +Reverts https://github.com/ruby/ruby/pull/10010 |
| 6 | +--- |
| 7 | + tool/rbinstall.rb | 12 ++++++------ |
| 8 | + 1 file changed, 6 insertions(+), 6 deletions(-) |
| 9 | + |
| 10 | +diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb |
| 11 | +index ebd76dc..105f0e8 100755 |
| 12 | +--- a/tool/rbinstall.rb |
| 13 | ++++ b/tool/rbinstall.rb |
| 14 | +@@ -367,7 +367,7 @@ goruby_install_name = "go" + ruby_install_name |
| 15 | + |
| 16 | + bindir = CONFIG["bindir", true] |
| 17 | + if CONFIG["libdirname"] == "archlibdir" |
| 18 | +- archbindir = bindir.sub(%r[/\K(?=[^/]+\z)]) {CONFIG["config_target"] + "/"} |
| 19 | ++ archbindir = nil#bindir.sub(%r[/\K(?=[^/]+\z)]) {CONFIG["config_target"] + "/"} |
| 20 | + end |
| 21 | + libdir = CONFIG[CONFIG.fetch("libdirname", "libdir"), true] |
| 22 | + rubyhdrdir = CONFIG["rubyhdrdir", true] |
| 23 | +@@ -898,11 +898,11 @@ install?(:local, :arch, :data) do |
| 24 | + if pc and File.file?(pc) and File.size?(pc) |
| 25 | + prepare "pkgconfig data", pkgconfigdir = File.join(libdir, "pkgconfig") |
| 26 | + install pc, pkgconfigdir, :mode => $data_mode |
| 27 | +- if (pkgconfig_base = CONFIG["libdir", true]) != libdir |
| 28 | +- prepare "pkgconfig data link", File.join(pkgconfig_base, "pkgconfig") |
| 29 | +- ln_sf(File.join("..", Path.relative(pkgconfigdir, pkgconfig_base), pc), |
| 30 | +- File.join(pkgconfig_base, "pkgconfig", pc)) |
| 31 | +- end |
| 32 | ++ #if (pkgconfig_base = CONFIG["libdir", true]) != libdir |
| 33 | ++ # prepare "pkgconfig data link", File.join(pkgconfig_base, "pkgconfig") |
| 34 | ++ # ln_sf(File.join("..", Path.relative(pkgconfigdir, pkgconfig_base), pc), |
| 35 | ++ # File.join(pkgconfig_base, "pkgconfig", pc)) |
| 36 | ++ #end |
| 37 | + end |
| 38 | + end |
| 39 | + |
0 commit comments