diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rwxr-xr-x | tool/mkconfig.rb | 2 |
4 files changed, 13 insertions, 3 deletions
@@ -1,3 +1,13 @@ +Thu Apr 2 16:26:59 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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 @@ -595,7 +595,7 @@ extconf: $(PREP) $(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 diff --git a/configure.in b/configure.in index db37cd6644..8a23f4ebc1 100644 --- a/configure.in +++ b/configure.in @@ -3567,7 +3567,7 @@ AS_CASE("$enable_shared", [yes], [ 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_*' diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index fc91ddec3f..b37241df61 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb @@ -136,7 +136,7 @@ File.foreach "config.status" do |line| v_others << v end case name - when "ruby_version" + when "RUBY_PROGRAM_VERSION" version = val[/\A"(.*)"\z/, 1] end end |