Skip to content

Commit 2955bcd

Browse files
committed
rbinstall: Disable arch-dependent file isolation
Reverts ruby/ruby#10010 Gbp-Pq: Name rbinstall-Disable-arch-dependent-file-isolation.patch
1 parent 51aca68 commit 2955bcd

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

tool/rbinstall.rb

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@ def CONFIG.[](name, mandatory = false)
367367

368368
bindir = CONFIG["bindir", true]
369369
if CONFIG["libdirname"] == "archlibdir"
370-
archbindir = bindir.sub(%r[/\K(?=[^/]+\z)]) {CONFIG["config_target"] + "/"}
370+
archbindir = nil#bindir.sub(%r[/\K(?=[^/]+\z)]) {CONFIG["config_target"] + "/"}
371371
end
372372
libdir = CONFIG[CONFIG.fetch("libdirname", "libdir"), true]
373373
rubyhdrdir = CONFIG["rubyhdrdir", true]
@@ -898,11 +898,11 @@ def (bins = []).add(name)
898898
if pc and File.file?(pc) and File.size?(pc)
899899
prepare "pkgconfig data", pkgconfigdir = File.join(libdir, "pkgconfig")
900900
install pc, pkgconfigdir, :mode => $data_mode
901-
if (pkgconfig_base = CONFIG["libdir", true]) != libdir
902-
prepare "pkgconfig data link", File.join(pkgconfig_base, "pkgconfig")
903-
ln_sf(File.join("..", Path.relative(pkgconfigdir, pkgconfig_base), pc),
904-
File.join(pkgconfig_base, "pkgconfig", pc))
905-
end
901+
#if (pkgconfig_base = CONFIG["libdir", true]) != libdir
902+
# prepare "pkgconfig data link", File.join(pkgconfig_base, "pkgconfig")
903+
# ln_sf(File.join("..", Path.relative(pkgconfigdir, pkgconfig_base), pc),
904+
# File.join(pkgconfig_base, "pkgconfig", pc))
905+
#end
906906
end
907907
end
908908

0 commit comments

Comments
 (0)