nobu	2015-04-02 16:27:12 +0900 (Thu, 02 Apr 2015)

  New Revision: 50152

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

  Log:
    rbconfig.rb: use program version
    
    * common.mk, tool/mkconfig.rb: check the running ruby version in
      rbconfig.rb with the program version, as RUBY_VERSION has never
      been affected by --with-ruby-version option.
      [ruby-core:68639] [Bug #11002]
    * configure.in (LIBRUBY_DLDFLAGS): compatibility_version must be
      valid version numbers, not an arbitrary string.

  Modified files:
    trunk/ChangeLog
    trunk/common.mk
    trunk/configure.in
    trunk/tool/mkconfig.rb
Index: configure.in
===================================================================
--- configure.in	(revision 50151)
+++ configure.in	(revision 50152)
@@ -3567,7 +3567,7 @@ AS_CASE("$enable_shared", [yes], [ https://github.com/ruby/ruby/blob/trunk/configure.in#L3567
 	fi
 	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)'
 	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(MAJOR).$(MINOR).$(TEENY)'
-	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(ruby_version)'
+	LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(RUBY_PROGRAM_VERSION)'
 	if test "$visibility_option" = ld; then
 	    LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,_Init_*'
 	    LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,_ruby_static_id_*'
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 50151)
+++ ChangeLog	(revision 50152)
@@ -1,3 +1,13 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Apr  2 16:26:59 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* common.mk, tool/mkconfig.rb: check the running ruby version in
+	  rbconfig.rb with the program version, as RUBY_VERSION has never
+	  been affected by --with-ruby-version option.
+	  [ruby-core:68639] [Bug #11002]
+
+	* configure.in (LIBRUBY_DLDFLAGS): compatibility_version must be
+	  valid version numbers, not an arbitrary string.
+
 Thu Apr  2 16:25:21 2015  svn  <svn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
 
 	* 2015-04-02
Index: common.mk
===================================================================
--- common.mk	(revision 50151)
+++ common.mk	(revision 50152)
@@ -595,7 +595,7 @@ extconf: $(PREP) https://github.com/ruby/ruby/blob/trunk/common.mk#L595
 
 $(RBCONFIG): $(srcdir)/tool/mkconfig.rb config.status $(srcdir)/version.h
 	$(Q)$(BOOTSTRAPRUBY) $(srcdir)/tool/mkconfig.rb -timestamp=$@ \
-		-arch=$(arch) -version=$(ruby_version) \
+		-arch=$(arch) -version=$(RUBY_PROGRAM_VERSION) \
 		-install_name=$(RUBY_INSTALL_NAME) \
 		-so_name=$(RUBY_SO_NAME) rbconfig.rb
 
Index: tool/mkconfig.rb
===================================================================
--- tool/mkconfig.rb	(revision 50151)
+++ tool/mkconfig.rb	(revision 50152)
@@ -136,7 +136,7 @@ File.foreach "config.status" do |line| https://github.com/ruby/ruby/blob/trunk/tool/mkconfig.rb#L136
       v_others << v
     end
     case name
-    when "ruby_version"
+    when "RUBY_PROGRAM_VERSION"
       version = val[/\A"(.*)"\z/, 1]
     end
   end

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