1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* configure.in (LIBPATHFLAG): should escape $. [ruby-dev:18572]

Browse Source 
* mkconfig.rb: never substute escaped $$.

* instruby.rb: not install LIBRUBY_SO unless enable-shared.
  [ruby-dev:18569]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2987 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2002-10-23 17:40:36 +00:00
parent 087671e87c
commit 6009002c58
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
Thu Oct 24 02:22:41 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* configure.in (LIBPATHFLAG): should escape $. [ruby-dev:18572]
* mkconfig.rb: never substute escaped $$.
* instruby.rb: not install LIBRUBY_SO unless enable-shared.
[ruby-dev:18569]
Wed Oct 23 19:16:06 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net> Wed Oct 23 19:16:06 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* eval.c (rb_eval): added NODE_DSYM, symbol literal with * eval.c (rb_eval): added NODE_DSYM, symbol literal with

2
configure.in
View File

@ -779,7 +779,7 @@ if test "$with_dln_a_out" != yes; then
netbsd*) LDSHARED='${CC} -shared' netbsd*) LDSHARED='${CC} -shared'
if test "$rb_cv_binary_elf" = yes; then if test "$rb_cv_binary_elf" = yes; then
LDFLAGS="-Wl,-export-dynamic" LDFLAGS="-Wl,-export-dynamic"
LIBPATHFLAG=' -L%1$s -Wl,-R%1$s' LIBPATHFLAG=' -L%1$$s -Wl,-R%1$$s'
fi fi
rb_cv_dlopen=yes ;; rb_cv_dlopen=yes ;;
openbsd*) LDSHARED="ld -Bforcearchive -Bshareable" openbsd*) LDSHARED="ld -Bforcearchive -Bshareable"

7
instruby.rb
View File

@ -20,6 +20,7 @@ destdir ||= ''
$:.unshift CONFIG["srcdir"]+"/lib" $:.unshift CONFIG["srcdir"]+"/lib"
require 'ftools' require 'ftools'
require 'shellwords'
class Installer < File; end class Installer < File; end
class << Installer class << Installer
@ -66,6 +67,8 @@ archlibdir = destdir+CONFIG["archdir"]
sitelibdir = destdir+CONFIG["sitelibdir"] sitelibdir = destdir+CONFIG["sitelibdir"]
sitearchlibdir = destdir+CONFIG["sitearchdir"] sitearchlibdir = destdir+CONFIG["sitearchdir"]
mandir = destdir+CONFIG["mandir"] + "/man1" mandir = destdir+CONFIG["mandir"] + "/man1"
configure_args = Shellwords.shellwords(CONFIG["configure_args"])
enable_shared = configure_args.include?('--enable-shared')
dll = CONFIG["LIBRUBY_SO"] dll = CONFIG["LIBRUBY_SO"]
lib = CONFIG["LIBRUBY"] lib = CONFIG["LIBRUBY"]
arc = CONFIG["LIBRUBY_A"] arc = CONFIG["LIBRUBY_A"]
@ -76,7 +79,7 @@ Installer.install ruby_install_name+exeext, bindir+"/"+ruby_install_name+exeext,
if rubyw_install_name and !rubyw_install_name.empty? if rubyw_install_name and !rubyw_install_name.empty?
Installer.install rubyw_install_name+exeext, bindir, 0755, true Installer.install rubyw_install_name+exeext, bindir, 0755, true
end end
Installer.install dll, bindir, 0755, true unless dll == lib Installer.install dll, bindir, 0755, true if enable_shared and dll != lib
Installer.install lib, libdir, 0555, true unless lib == arc Installer.install lib, libdir, 0555, true unless lib == arc
Installer.install arc, archlibdir, 0644, true Installer.install arc, archlibdir, 0644, true
Installer.install "config.h", archlibdir, 0644, true Installer.install "config.h", archlibdir, 0644, true
@ -97,7 +100,7 @@ Dir.chdir CONFIG["srcdir"]
Installer.install "sample/irb.rb", "#{bindir}/irb", 0755, true Installer.install "sample/irb.rb", "#{bindir}/irb", 0755, true
Dir.glob("lib/*{.rb,help-message}") do |f| Dir.glob("lib/**/*{.rb,help-message}") do |f|
dir = File.dirname(f).sub!(/\Alib/, rubylibdir) || rubylibdir dir = File.dirname(f).sub!(/\Alib/, rubylibdir) || rubylibdir
Installer.makedirs dir, true unless File.directory? dir Installer.makedirs dir, true unless File.directory? dir
Installer.install f, dir, 0644, true Installer.install f, dir, 0644, true

2
mkconfig.rb
View File

@ -39,7 +39,7 @@ File.foreach "config.status" do |line|
next if $install_name and /^RUBY_INSTALL_NAME$/ =~ name next if $install_name and /^RUBY_INSTALL_NAME$/ =~ name
next if $so_name and /^RUBY_SO_NAME$/ =~ name next if $so_name and /^RUBY_SO_NAME$/ =~ name
v = " CONFIG[\"" + name + "\"] = " + v = " CONFIG[\"" + name + "\"] = " +
val.gsub(/\$\{?(\w+)\}?/) {"$(#{$1})"}.dump + "\n" val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1?"$(#{$1})":$&}.dump + "\n"
if fast[name] if fast[name]
v_fast << v v_fast << v
else else