[前][次][番号順一覧][スレッド一覧]

ruby-changes:9239

From: yugui <ko1@a...>
Date: Tue, 16 Dec 2008 12:45:21 +0900 (JST)
Subject: [ruby-changes:9239] Ruby:r20775 (ruby_1_9_1): merges r20572 from trunk into ruby_1_9_1.

yugui	2008-12-16 12:45:03 +0900 (Tue, 16 Dec 2008)

  New Revision: 20775

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20775

  Log:
    merges r20572 from trunk into ruby_1_9_1.
    * Makefile.in (LIBRUBY_SO): localizes non-public symbols.
    * configure.in (OBJDUMP, OBJCOPY): for dealing with binary files.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/Makefile.in
    branches/ruby_1_9_1/configure.in

Index: ruby_1_9_1/configure.in
===================================================================
--- ruby_1_9_1/configure.in	(revision 20774)
+++ ruby_1_9_1/configure.in	(revision 20775)
@@ -214,6 +214,9 @@
 ASFLAGS=$ASFLAGS
 AC_SUBST(ASFLAGS)
 
+AC_CHECK_TOOL(OBJDUMP, objdump)
+AC_CHECK_TOOL(OBJCOPY, objcopy)
+
 case "$target_os" in
 cygwin*|mingw*)
     AC_CHECK_TOOL(NM, nm)
@@ -223,7 +226,6 @@
     case "$target_os" in
     mingw*)
 	test "$rb_cv_msvcrt" = "" && unset rb_cv_msvcrt
-	AC_CHECK_TOOL(OBJDUMP, objdump)
 	AC_CACHE_CHECK(for mingw32 runtime DLL, rb_cv_msvcrt, [
 	AC_TRY_LINK([#include <stdio.h>],
 		    [FILE* volatile f = stdin; return 0;],
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 20774)
+++ ruby_1_9_1/ChangeLog	(revision 20775)
@@ -1,3 +1,9 @@
+Sun Dec  7 23:17:33 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* Makefile.in (LIBRUBY_SO): localizes non-public symbols.
+
+	* configure.in (OBJDUMP, OBJCOPY): for dealing with binary files.
+
 Mon Dec 15 10:00:36 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* common.mk (btest-ruby): use RUNRUBY instead of MINIRUBY to load the
Index: ruby_1_9_1/Makefile.in
===================================================================
--- ruby_1_9_1/Makefile.in	(revision 20774)
+++ ruby_1_9_1/Makefile.in	(revision 20775)
@@ -102,6 +102,8 @@
 ASFLAGS       = @ASFLAGS@
 IFCHANGE      = $(srcdir)/tool/ifchange
 SET_LC_MESSAGES = env LC_MESSAGES=C
+OBJDUMP       = @OBJDUMP@
+OBJCOPY       = @OBJCOPY@
 
 OBJEXT        = @OBJEXT@
 ASMEXT        = S
@@ -137,6 +139,9 @@
 $(LIBRUBY_SO):
 		@-$(PRE_LIBRUBY_UPDATE)
 		$(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@
+		@-test "$(OBJDUMP)" = "" || test "$(OBJCOPY)" = "" || { \
+		set dummy `$(OBJDUMP) -t $@ | sed '/^[^ ]* g/!d;s/.* //;/^\(Init_\|vm_\)/!d;s/^/-L /'`; \
+		shift; test "$$#" = 0 || $(OBJCOPY) "$$@" $@; }
 		@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
 						  File.symlink "$(LIBRUBY_SO)", link}' \
 				$(LIBRUBY_ALIASES) || true

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]