[Bug #20800] Locate executable binary file under "libexec" directly
"libexec" means the directory for executable or binary files already.
This commit is contained in:
parent
e83eca01a1
commit
303a52c201
Notes:
git
2024-11-09 12:50:58 +00:00
@ -3592,6 +3592,7 @@ AS_CASE("$enable_shared", [yes], [
|
|||||||
])
|
])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
relative_libprefix="/../${multiarch+../}${libdir_basename}"
|
||||||
AS_CASE(["$target_os"],
|
AS_CASE(["$target_os"],
|
||||||
[sunos4*], [
|
[sunos4*], [
|
||||||
LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)'
|
LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)'
|
||||||
@ -3600,7 +3601,7 @@ AS_CASE("$enable_shared", [yes], [
|
|||||||
RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,$(LIBRUBY_SONAME)' "$LDFLAGS_OPTDIR"])
|
RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,$(LIBRUBY_SONAME)' "$LDFLAGS_OPTDIR"])
|
||||||
LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)'
|
LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)'
|
||||||
AS_IF([test "$load_relative" = yes], [
|
AS_IF([test "$load_relative" = yes], [
|
||||||
libprefix="'\$\${ORIGIN}/../${multiarch+../../}${libdir_basename}'"
|
libprefix="'\$\${ORIGIN}${relative_libprefix}'"
|
||||||
LIBRUBY_RPATHFLAGS="-Wl,-rpath,${libprefix}"
|
LIBRUBY_RPATHFLAGS="-Wl,-rpath,${libprefix}"
|
||||||
LIBRUBY_RELATIVE=yes
|
LIBRUBY_RELATIVE=yes
|
||||||
])
|
])
|
||||||
@ -3612,7 +3613,7 @@ AS_CASE("$enable_shared", [yes], [
|
|||||||
LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
|
LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
|
||||||
LIBRUBY_ALIASES=''
|
LIBRUBY_ALIASES=''
|
||||||
], [test "$load_relative" = yes], [
|
], [test "$load_relative" = yes], [
|
||||||
libprefix="'\$\$ORIGIN/../${multiarch+../../}${libdir_basename}'"
|
libprefix="'\$\$ORIGIN${relative_libprefix}'"
|
||||||
LIBRUBY_RPATHFLAGS="-Wl,-rpath,${libprefix}"
|
LIBRUBY_RPATHFLAGS="-Wl,-rpath,${libprefix}"
|
||||||
LIBRUBY_RELATIVE=yes
|
LIBRUBY_RELATIVE=yes
|
||||||
])
|
])
|
||||||
@ -3636,7 +3637,7 @@ AS_CASE("$enable_shared", [yes], [
|
|||||||
LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)'
|
LIBRUBY_ALIASES='$(LIBRUBY_SONAME) lib$(RUBY_SO_NAME).$(SOEXT)'
|
||||||
RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ["${linker_flag}-h${linker_flag:+,}"'$(@F)'])
|
RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ["${linker_flag}-h${linker_flag:+,}"'$(@F)'])
|
||||||
AS_IF([test "$load_relative" = yes], [
|
AS_IF([test "$load_relative" = yes], [
|
||||||
libprefix="'\$\$ORIGIN/../${multiarch+../../}${libdir_basename}'"
|
libprefix="'\$\$ORIGIN${relative_libprefix}'"
|
||||||
LIBRUBY_RPATHFLAGS="-R${libprefix}"
|
LIBRUBY_RPATHFLAGS="-R${libprefix}"
|
||||||
LIBRUBY_RELATIVE=yes
|
LIBRUBY_RELATIVE=yes
|
||||||
], [
|
], [
|
||||||
@ -3653,7 +3654,7 @@ AS_CASE("$enable_shared", [yes], [
|
|||||||
LIBRUBY_SONAME='$(LIBRUBY_SO)'
|
LIBRUBY_SONAME='$(LIBRUBY_SO)'
|
||||||
LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)'
|
LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)'
|
||||||
AS_IF([test "$load_relative" = yes], [
|
AS_IF([test "$load_relative" = yes], [
|
||||||
libprefix="@executable_path/../${multiarch+../../}${libdir_basename}"
|
libprefix="@executable_path${relative_libprefix}"
|
||||||
LIBRUBY_RELATIVE=yes
|
LIBRUBY_RELATIVE=yes
|
||||||
])
|
])
|
||||||
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS -install_name ${libprefix}"'/$(LIBRUBY_SONAME)'
|
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS -install_name ${libprefix}"'/$(LIBRUBY_SONAME)'
|
||||||
|
@ -34,7 +34,7 @@ vendordir = config["vendordir"]
|
|||||||
rubylibdir = config["rubylibdir"]
|
rubylibdir = config["rubylibdir"]
|
||||||
rubyarchdir = config["rubyarchdir"]
|
rubyarchdir = config["rubyarchdir"]
|
||||||
archdir = "#{extout}/#{arch}"
|
archdir = "#{extout}/#{arch}"
|
||||||
exedir = libdirname == "archlibdir" ? "#{config["libexecdir"]}/#{arch}/bin" : bindir
|
exedir = libdirname == "archlibdir" ? "#{config["libexecdir"]}/#{arch}" : bindir
|
||||||
[exedir, libdir, archdir].uniq.each do |dir|
|
[exedir, libdir, archdir].uniq.each do |dir|
|
||||||
File.directory?(dir) or mkdir_p(dir)
|
File.directory?(dir) or mkdir_p(dir)
|
||||||
end
|
end
|
||||||
|
@ -371,7 +371,7 @@ if CONFIG["libdirname"] == "archlibdir"
|
|||||||
unless libexecdir.sub!(/\$\(lib\K(?=dir\))/) {"exec"}
|
unless libexecdir.sub!(/\$\(lib\K(?=dir\))/) {"exec"}
|
||||||
libexecdir = "$(libexecdir)/$(arch)"
|
libexecdir = "$(libexecdir)/$(arch)"
|
||||||
end
|
end
|
||||||
archbindir = RbConfig.expand(libexecdir) + "/bin"
|
archbindir = RbConfig.expand(libexecdir)
|
||||||
end
|
end
|
||||||
libdir = CONFIG[CONFIG.fetch("libdirname", "libdir"), true]
|
libdir = CONFIG[CONFIG.fetch("libdirname", "libdir"), true]
|
||||||
rubyhdrdir = CONFIG["rubyhdrdir", true]
|
rubyhdrdir = CONFIG["rubyhdrdir", true]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user