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

ruby-changes:48070

From: nobu <ko1@a...>
Date: Sun, 15 Oct 2017 11:31:34 +0900 (JST)
Subject: [ruby-changes:48070] nobu:r60184 (trunk): configure.ac: fix SONAME

nobu	2017-10-15 11:31:29 +0900 (Sun, 15 Oct 2017)

  New Revision: 60184

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

  Log:
    configure.ac: fix SONAME
    
    * configure.ac (RUBY_SO_NAME): revert $(RUBY_API_VERSION:.=) to
      $(MAJOR)$(MINOR), as a string in middle is not replaced.
      [ruby-core:83208] [Bug #14002]

  Modified files:
    trunk/configure.ac
Index: configure.ac
===================================================================
--- configure.ac	(revision 60183)
+++ configure.ac	(revision 60184)
@@ -3789,10 +3789,10 @@ AC_ARG_WITH(soname, https://github.com/ruby/ruby/blob/trunk/configure.ac#L3789
 	        RUBY_SO_NAME='$(RUBY_BASE_NAME).$(RUBY_PROGRAM_VERSION)'
 	    ],
 	    [cygwin*], [
-	        RUBY_SO_NAME='$(RUBY_BASE_NAME)$(RUBY_API_VERSION:.=)0'
+	        RUBY_SO_NAME='$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0'
 	    ],
 	    [mingw*], [
-		RUBY_SO_NAME="${rb_cv_msvcrt}"'-$(RUBY_BASE_NAME)$(RUBY_API_VERSION:.=)0'
+		RUBY_SO_NAME="${rb_cv_msvcrt}"'-$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)0'
 		AS_IF([test x"${target_cpu}" != xi386], [
 		    RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}"
 		])
@@ -3857,7 +3857,7 @@ AS_CASE("$enable_shared", [yes], [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L3857
 	],
     [freebsd*|dragonfly*], [
 	SOLIBS='$(LIBS)'
-	LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(RUBY_API_VERSION:.=)'
+	LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
 	LIBRUBY_SO='$(LIBRUBY_SONAME)'
 	AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
 	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
@@ -3866,7 +3866,7 @@ AS_CASE("$enable_shared", [yes], [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L3866
 	],
     [netbsd*], [
 	SOLIBS='$(LIBS)'
-	LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(RUBY_API_VERSION:.=)'
+	LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
 	LIBRUBY_SO='$(LIBRUBY_SONAME).$(TEENY)'
 	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,$(LIBRUBY_SONAME)' "$LDFLAGS_OPTDIR"])
 	AS_IF([test "$rb_cv_binary_elf" = yes], [ # ELF platforms

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

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