usa	2013-04-04 09:49:52 +0900 (Thu, 04 Apr 2013)

  New Revision: 40093

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

  Log:
    merge revision(s) 36338: [Backport #6709]
    
    * configure.in (DLDFLAGS): use TARGET_ENTRY to specify an entry point
      instead of TARGET which may contain non-identifer characters.
    
    * lib/mkmf.rb (create_makefile): add TARGET_NAME which is the first
      part consists of only word characters.  [ruby-core:46248][Bug #6709]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/configure.in
    branches/ruby_1_9_3/lib/mkmf.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/configure.in
===================================================================
--- ruby_1_9_3/configure.in	(revision 40092)
+++ ruby_1_9_3/configure.in	(revision 40093)
@@ -2065,7 +2065,7 @@ if test "$with_dln_a_out" != yes; then https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/configure.in#L2065
 			rb_cv_dlopen=yes],
         [aix*], [	: ${LDSHARED='$(CC)'}
 			LDSHARED="$LDSHARED ${linker_flag}-G"
-			EXTDLDFLAGS='-eInit_$(TARGET)'
+			EXTDLDFLAGS='-e$(TARGET_ENTRY)'
 			XLDFLAGS="${linker_flag}"'-bE:$(ARCHFILE)'" ${linker_flag}-brtl"
 			XLDFLAGS="$XLDFLAGS ${linker_flag}-blibpath:${prefix}/lib:${LIBPATH:-/usr/lib:/lib}"
 			: ${ARCHFILE="ruby.imp"}
@@ -2082,7 +2082,7 @@ if test "$with_dln_a_out" != yes; then https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/configure.in#L2082
 	[beos*], [	AS_CASE(["$target_cpu"],
 			  [powerpc*], [
 			    : ${LDSHARED="ld -xms"}
-			    EXTDLDFLAGS='-export Init_$(TARGET)'
+			    EXTDLDFLAGS='-export $(TARGET_ENTRY)'
 			    DLDFLAGS="$DLDFLAGS -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o"
 			    LDFLAGS="$LDFLAGS -L/boot/home/config/lib -lbe -lroot"
 			    ],
@@ -2096,7 +2096,7 @@ if test "$with_dln_a_out" != yes; then https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/configure.in#L2096
 	[haiku*], [	AS_CASE(["$target_cpu"],
 			  [powerpc*], [
 			    : ${LDSHARED="ld -xms"}
-			    EXTDLDFLAGS='-export Init_$(TARGET)'
+			    EXTDLDFLAGS='-export $(TARGET_ENTRY)'
 			    DLDFLAGS="$DLDFLAGS -lbe -lroot glue-noinit.a init_term_dyn.o start_dyn.o"
                             ],
 			  [i586*], [
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 40092)
+++ ruby_1_9_3/ChangeLog	(revision 40093)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Thu Apr  4 09:44:10 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in (DLDFLAGS): use TARGET_ENTRY to specify an entry point
+	  instead of TARGET which may contain non-identifer characters.
+
+	* lib/mkmf.rb (create_makefile): add TARGET_NAME which is the first
+	  part consists of only word characters.  [ruby-core:46248][Bug #6709]
+
 Tue Apr  2 13:13:19 2013  Martin Duerst  <duerst@i...>
 
 	* transcode.c (documentation for str_encode): Explain
Index: ruby_1_9_3/lib/mkmf.rb
===================================================================
--- ruby_1_9_3/lib/mkmf.rb	(revision 40092)
+++ ruby_1_9_3/lib/mkmf.rb	(revision 40093)
@@ -1925,7 +1925,7 @@ def create_makefile(target, srcprefix = https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/lib/mkmf.rb#L1925
         makedef = %{-pe "$_.sub!(/^(?=\\w)/,'#{EXPORT_PREFIX}') unless 1../^EXPORTS$/i"}
       end
     else
-      makedef = %{-e "puts 'EXPORTS', '#{EXPORT_PREFIX}' + 'Init_$(TARGET)'.sub(/\\..*\\z/,'')"}
+      makedef = %{-e "puts 'EXPORTS', '$(TARGET_ENTRY)'"}
     end
     if makedef
       $cleanfiles << '$(DEFFILE)'
@@ -1969,6 +1969,8 @@ LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS} https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/lib/mkmf.rb#L1969
 SRCS = #{srcs.collect(&File.method(:basename)).join(' ')}
 OBJS = #{$objs.join(" ")}
 TARGET = #{target}
+TARGET_NAME = #{target && target[/\A\w+/]}
+TARGET_ENTRY = #{EXPORT_PREFIX || ''}Init_$(TARGET_NAME)
 DLLIB = #{dllib}
 EXTSTATIC = #{$static || ""}
 STATIC_LIB = #{staticlib unless $static.nil?}
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 40092)
+++ ruby_1_9_3/version.h	(revision 40093)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 408
+#define RUBY_PATCHLEVEL 409
 
-#define RUBY_RELEASE_DATE "2013-04-02"
+#define RUBY_RELEASE_DATE "2013-04-04"
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 2
+#define RUBY_RELEASE_DAY 4
 
 #include "ruby/version.h"
 

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r36338


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